[gedit] Bump peas to 0.5.5 and fix gedit to use the new api.

[Ignacio Casal Quinteiro <icq src gnome org>]

commit 041399d3d09389f951af8db4f5b83d142a9ebe55
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Tue Aug 17 12:46:05 2010 +0200

    Bump peas to 0.5.5 and fix gedit to use the new api.

 configure.ac                             |    4 ++--
 gedit/dialogs/gedit-preferences-dialog.c |    4 ++--
 gedit/gedit-dirs.c                       |    6 ------
 gedit/gedit-dirs.h                       |    2 --
 gedit/gedit-plugins-engine.c             |    3 ---
 plugins/time/gedit-time-plugin.c         |   14 +++++++-------
 6 files changed, 11 insertions(+), 22 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8e4e86a..048b766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -273,8 +273,8 @@ PKG_CHECK_MODULES(GEDIT, [
 	gio-2.0 >= 2.25.11
 	gtk+-3.0 >= 2.90.6
 	gtksourceview-3.0 >= 2.11.2
-	libpeas-1.0 >= 0.5.4
-	libpeasui-1.0 >= 0.5.4
+	libpeas-1.0 >= 0.5.5
+	libpeas-gtk-1.0 >= 0.5.5
 	gsettings-desktop-schemas
 ])
 
diff --git a/gedit/dialogs/gedit-preferences-dialog.c b/gedit/dialogs/gedit-preferences-dialog.c
index 0e0009e..0ae1b30 100644
--- a/gedit/dialogs/gedit-preferences-dialog.c
+++ b/gedit/dialogs/gedit-preferences-dialog.c
@@ -37,7 +37,7 @@
 #include <string.h>
 
 #include <glib/gi18n.h>
-#include <libpeasui/peas-ui-plugin-manager.h>
+#include <libpeas-gtk/peas-gtk-plugin-manager.h>
 
 #include "gedit-preferences-dialog.h"
 #include "gedit-utils.h"
@@ -911,7 +911,7 @@ setup_plugins_page (GeditPreferencesDialog *dlg)
 
 	engine = gedit_plugins_engine_get_default ();
 
-	page_content = peas_ui_plugin_manager_new (PEAS_ENGINE (engine));
+	page_content = peas_gtk_plugin_manager_new (PEAS_ENGINE (engine));
 	g_return_if_fail (page_content != NULL);
 
 	gtk_box_pack_start (GTK_BOX (dlg->priv->plugin_manager_place_holder),
diff --git a/gedit/gedit-dirs.c b/gedit/gedit-dirs.c
index 980c6a5..5babae1 100644
--- a/gedit/gedit-dirs.c
+++ b/gedit/gedit-dirs.c
@@ -173,12 +173,6 @@ gedit_dirs_get_gedit_plugins_data_dir (void)
 	return gedit_plugins_data_dir;
 }
 
-const gchar *
-gedit_dirs_get_binding_modules_dir (void)
-{
-	return gedit_lib_dir;
-}
-
 gchar *
 gedit_dirs_get_ui_file (const gchar *file)
 {
diff --git a/gedit/gedit-dirs.h b/gedit/gedit-dirs.h
index 236210f..888d687 100644
--- a/gedit/gedit-dirs.h
+++ b/gedit/gedit-dirs.h
@@ -50,8 +50,6 @@ const gchar	*gedit_dirs_get_gedit_plugins_dir	(void);
 
 const gchar	*gedit_dirs_get_gedit_plugins_data_dir	(void);
 
-const gchar	*gedit_dirs_get_binding_modules_dir	(void);
-
 gchar		*gedit_dirs_get_ui_file			(const gchar *file);
 
 G_END_DECLS
diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
index 79cfe3f..98a8bdc 100644
--- a/gedit/gedit-plugins-engine.c
+++ b/gedit/gedit-plugins-engine.c
@@ -94,7 +94,6 @@ GeditPluginsEngine *
 gedit_plugins_engine_get_default (void)
 {
 	gchar *typelib_dir;
-	const gchar *modules_dir;
 	const gchar **search_paths;
 
 	if (default_engine != NULL)
@@ -116,7 +115,6 @@ gedit_plugins_engine_get_default (void)
 	g_irepository_require (g_irepository_get_default (),
 			       "PeasUI", "1.0", 0, NULL);
 
-	modules_dir = gedit_dirs_get_binding_modules_dir ();
 	search_paths = g_new (const gchar *, 5);
 	/* Add the user plugins dir in ~ */
 	search_paths[0] = gedit_dirs_get_user_plugins_dir ();
@@ -129,7 +127,6 @@ gedit_plugins_engine_get_default (void)
 
 	default_engine = GEDIT_PLUGINS_ENGINE (g_object_new (GEDIT_TYPE_PLUGINS_ENGINE,
 							     "app-name", "Gedit",
-							     "base-module-dir", modules_dir,
 							     "search-paths", search_paths,
 							     NULL));
 
diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c
index 85b2b27..6b38832 100644
--- a/plugins/time/gedit-time-plugin.c
+++ b/plugins/time/gedit-time-plugin.c
@@ -41,7 +41,7 @@
 #include <gedit/gedit-utils.h>
 #include <gedit/gedit-window.h>
 #include <gedit/gedit-window-activatable.h>
-#include <libpeasui/peas-ui-configurable.h>
+#include <libpeas-gtk/peas-gtk-configurable.h>
 
 #define GEDIT_TIME_PLUGIN_GET_PRIVATE(object)(G_TYPE_INSTANCE_GET_PRIVATE ((object), \
 					      GEDIT_TYPE_TIME_PLUGIN, \
@@ -167,7 +167,7 @@ enum
 };
 
 static void gedit_window_activatable_iface_init (GeditWindowActivatableInterface *iface);
-static void peas_ui_configurable_iface_init (PeasUIConfigurableInterface *iface);
+static void peas_gtk_configurable_iface_init (PeasGtkConfigurableInterface *iface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (GeditTimePlugin,
 				gedit_time_plugin,
@@ -175,8 +175,8 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED (GeditTimePlugin,
 				0,
 				G_IMPLEMENT_INTERFACE_DYNAMIC (GEDIT_TYPE_WINDOW_ACTIVATABLE,
 							       gedit_window_activatable_iface_init)
-				G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_UI_TYPE_CONFIGURABLE,
-							       peas_ui_configurable_iface_init))
+				G_IMPLEMENT_INTERFACE_DYNAMIC (PEAS_GTK_TYPE_CONFIGURABLE,
+							       peas_gtk_configurable_iface_init))
 
 static void time_cb (GtkAction *action, GeditTimePlugin *plugin);
 
@@ -1122,7 +1122,7 @@ time_cb (GtkAction       *action,
 }
 
 static GtkWidget *
-gedit_time_plugin_create_configure_widget (PeasUIConfigurable *configurable)
+gedit_time_plugin_create_configure_widget (PeasGtkConfigurable *configurable)
 {
 	TimeConfigureWidget *widget;
 
@@ -1151,7 +1151,7 @@ gedit_time_plugin_class_finalize (GeditTimePluginClass *klass)
 }
 
 static void
-peas_ui_configurable_iface_init (PeasUIConfigurableInterface *iface)
+peas_gtk_configurable_iface_init (PeasGtkConfigurableInterface *iface)
 {
 	iface->create_configure_widget = gedit_time_plugin_create_configure_widget;
 }
@@ -1173,7 +1173,7 @@ peas_register_types (PeasObjectModule *module)
 						    GEDIT_TYPE_WINDOW_ACTIVATABLE,
 						    GEDIT_TYPE_TIME_PLUGIN);
 	peas_object_module_register_extension_type (module,
-						    PEAS_UI_TYPE_CONFIGURABLE,
+						    PEAS_GTK_TYPE_CONFIGURABLE,
 						    GEDIT_TYPE_TIME_PLUGIN);
 }