GNOME.org
 

[gedit/libgpe: 77/79] Update gedit for use with the renamed libpeas library.

commit 8b9739c110fb738826e4fe67c01495069feca9c9
Author: Steve Frécinaux <code istique net>
Date:   Sun Dec 6 18:17:30 2009 +0100

    Update gedit for use with the renamed libpeas library.

 bindings/python/gedit.override                  |    2 +-
 bindings/python/geditmodule.c                   |   16 +++++-----
 configure.ac                                    |    4 +-
 gedit/dialogs/gedit-preferences-dialog.c        |    4 +-
 gedit/gedit-plugin.c                            |    2 +-
 gedit/gedit-plugin.h                            |    8 ++--
 gedit/gedit-plugins-engine.c                    |   38 +++++++++++-----------
 gedit/gedit-plugins-engine.h                    |    8 ++--
 gedit/gedit-window.c                            |   22 ++++++------
 gedit/gedit.c                                   |    2 +-
 plugins/changecase/gedit-changecase-plugin.c    |    8 ++--
 plugins/changecase/gedit-changecase-plugin.h    |    2 +-
 plugins/checkupdate/gedit-check-update-plugin.h |    2 +-
 plugins/docinfo/gedit-docinfo-plugin.c          |   10 +++---
 plugins/docinfo/gedit-docinfo-plugin.h          |    2 +-
 plugins/filebrowser/gedit-file-browser-plugin.c |   10 +++---
 plugins/filebrowser/gedit-file-browser-plugin.h |    2 +-
 plugins/indent/gedit-indent-plugin.c            |    8 ++--
 plugins/indent/gedit-indent-plugin.h            |    2 +-
 plugins/modelines/gedit-modeline-plugin.c       |    8 ++--
 plugins/modelines/gedit-modeline-plugin.h       |    2 +-
 plugins/sort/gedit-sort-plugin.c                |   10 +++---
 plugins/sort/gedit-sort-plugin.h                |    2 +-
 plugins/spell/gedit-spell-plugin.c              |   12 +++---
 plugins/spell/gedit-spell-plugin.h              |    2 +-
 plugins/taglist/gedit-taglist-plugin.c          |   10 +++---
 plugins/taglist/gedit-taglist-plugin.h          |    2 +-
 plugins/time/gedit-time-plugin.c                |   14 ++++----
 plugins/time/gedit-time-plugin.h                |    2 +-
 29 files changed, 108 insertions(+), 108 deletions(-)
---
diff --git a/bindings/python/gedit.override b/bindings/python/gedit.override
index 56b39ca..b0f35e2 100644
--- a/bindings/python/gedit.override
+++ b/bindings/python/gedit.override
@@ -75,7 +75,7 @@ import gtksourceview2.Buffer as PyGtkSourceBuffer_Type
 import gtksourceview2.View as PyGtkSourceView_Type
 import gtksourceview2.Language as PyGtkSourceLanguage_Type
 import gtksourceview2.LanguageManager as PyGtkSourceLanguageManager_Type
-import libgpe.Plugin as PyGPEPlugin_Type
+import libpeas.Plugin as PyPeasPlugin_Type
 %%
 ignore-glob
   *_get_type
diff --git a/bindings/python/geditmodule.c b/bindings/python/geditmodule.c
index 9075fdd..68ebecd 100644
--- a/bindings/python/geditmodule.c
+++ b/bindings/python/geditmodule.c
@@ -123,26 +123,26 @@ init_pygtksourceview (int major, int minor, int micro)
 }
 
 static gboolean
-init_pylibgpe (int major, int minor, int micro)
+init_pylibpeas (int major, int minor, int micro)
 {
-	PyObject *libgpe, *mdict, *version, *required_version;
+	PyObject *libpeas, *mdict, *version, *required_version;
 
-	libgpe = PyImport_ImportModule ("libgpe");
-	if (libgpe == NULL)
+	libpeas = PyImport_ImportModule ("libpeas");
+	if (libpeas == NULL)
 	{
 		PyErr_SetString (PyExc_ImportError,
-				 "could not import libgpe");
+				 "could not import libpeas");
 		return FALSE;
 	}
 
-	mdict = PyModule_GetDict (libgpe);
+	mdict = PyModule_GetDict (libpeas);
 	version = PyDict_GetItemString (mdict, "version");
 	required_version = Py_BuildValue ("(iii)", major, minor, micro);
 
 	if (PyObject_Compare (version, required_version) == -1)
 	{
 		PyErr_SetString (PyExc_ImportError,
-				 "libgpe version too old");
+				 "libpeas version too old");
 		Py_DECREF (required_version);
 		return FALSE;
 	}
@@ -198,7 +198,7 @@ init_gedit (void)
 	if (!init_pygtksourceview (0, 8, 0))
 		return;
 
-	if (!init_pylibgpe (2, 28, 0))
+	if (!init_pylibpeas (2, 28, 0))
 		return;
 
 	init_pygedit ();
diff --git a/configure.ac b/configure.ac
index 8f1a8b6..ce01f01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -252,8 +252,8 @@ PKG_CHECK_MODULES(GEDIT, [
 	gtk+-2.0 >= 2.16.0
 	gtksourceview-2.0 >= 2.4.0
 	gconf-2.0 >= 1.1.11
-	libgpe-2.0 >= 2.18.0
-	libgpeui-2.0 >= 2.18.0
+	libpeas-2.0 >= 2.18.0
+	libpeasui-2.0 >= 2.18.0
 ])
 
 dnl FIXME: Remove this when removing gedit-message-area
diff --git a/gedit/dialogs/gedit-preferences-dialog.c b/gedit/dialogs/gedit-preferences-dialog.c
index a6c7bb9..70bfb5d 100644
--- a/gedit/dialogs/gedit-preferences-dialog.c
+++ b/gedit/dialogs/gedit-preferences-dialog.c
@@ -38,7 +38,7 @@
 
 #include <glib/gi18n.h>
 #include <gconf/gconf-client.h>
-#include <libgpeui/gpe-plugin-manager.h>
+#include <libpeasui/peas-plugin-manager.h>
 
 #include <gedit/gedit-prefs-manager.h>
 
@@ -1047,7 +1047,7 @@ setup_plugins_page (GeditPreferencesDialog *dlg)
 
 	gedit_debug (DEBUG_PREFS);
 
-	page_content = gpe_plugin_manager_new (GPE_ENGINE (gedit_plugins_engine_get_default ()));
+	page_content = peas_plugin_manager_new (PEAS_ENGINE (gedit_plugins_engine_get_default ()));
 	g_return_if_fail (page_content != NULL);
 
 	gtk_box_pack_start (GTK_BOX (dlg->priv->plugin_manager_place_holder),
diff --git a/gedit/gedit-plugin.c b/gedit/gedit-plugin.c
index f7f6be8..a24148f 100644
--- a/gedit/gedit-plugin.c
+++ b/gedit/gedit-plugin.c
@@ -34,7 +34,7 @@
 #include "gedit-plugin.h"
 #include "gedit-dirs.h"
 
-G_DEFINE_TYPE(GeditPlugin, gedit_plugin, GPE_TYPE_PLUGIN)
+G_DEFINE_TYPE(GeditPlugin, gedit_plugin, PEAS_TYPE_PLUGIN)
 
 static void 
 gedit_plugin_class_init (GeditPluginClass *klass)
diff --git a/gedit/gedit-plugin.h b/gedit/gedit-plugin.h
index da2e8bd..5295023 100644
--- a/gedit/gedit-plugin.h
+++ b/gedit/gedit-plugin.h
@@ -33,7 +33,7 @@
 #define __GEDIT_PLUGIN_H__
 
 #include <glib-object.h>
-#include <libgpe/gpe-plugin.h>
+#include <libpeas/peas-plugin.h>
 
 G_BEGIN_DECLS
 
@@ -54,7 +54,7 @@ typedef struct _GeditPlugin GeditPlugin;
 
 struct _GeditPlugin 
 {
-	GPEPlugin parent;
+	PeasPlugin parent;
 };
 
 /*
@@ -64,7 +64,7 @@ typedef struct _GeditPluginClass GeditPluginClass;
 
 struct _GeditPluginClass 
 {
-	GPEPluginClass parent_class;
+	PeasPluginClass parent_class;
 };
 
 /*
@@ -94,7 +94,7 @@ plugin_name##_class_finalize (PluginName##Class *klass)				\
 										\
 										\
 G_MODULE_EXPORT GType								\
-register_gpe_plugin (GTypeModule *type_module)				\
+register_peas_plugin (GTypeModule *type_module)				\
 {										\
 	plugin_name##_register_type (type_module);				\
 										\
diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
index 22bf9fd..71c055c 100644
--- a/gedit/gedit-plugins-engine.c
+++ b/gedit/gedit-plugins-engine.c
@@ -46,7 +46,7 @@
 #define GEDIT_PLUGINS_ENGINE_BASE_KEY "/apps/gedit-2/plugins"
 #define GEDIT_PLUGINS_ENGINE_KEY GEDIT_PLUGINS_ENGINE_BASE_KEY "/active-plugins"
 
-G_DEFINE_TYPE(GeditPluginsEngine, gedit_plugins_engine, GPE_TYPE_ENGINE)
+G_DEFINE_TYPE(GeditPluginsEngine, gedit_plugins_engine, PEAS_TYPE_ENGINE)
 
 struct _GeditPluginsEnginePrivate
 {
@@ -55,7 +55,7 @@ struct _GeditPluginsEnginePrivate
 	gboolean setting_active_plugins;
 };
 
-GPEEngine *default_engine = NULL;
+PeasEngine *default_engine = NULL;
 
 static void
 gedit_plugins_engine_init (GeditPluginsEngine *engine)
@@ -70,7 +70,7 @@ gedit_plugins_engine_init (GeditPluginsEngine *engine)
 }
 
 static void
-save_active_plugin_list (GPEEngine *engine)
+save_active_plugin_list (PeasEngine *engine)
 {
 	GSList *list = NULL;
 	gchar **active_plugins;
@@ -78,7 +78,7 @@ save_active_plugin_list (GPEEngine *engine)
 
 	g_debug ("Saving the plugin list.");
 
-	active_plugins = gpe_engine_get_active_plugins (engine);
+	active_plugins = peas_engine_get_active_plugins (engine);
 
 	for (i = 0; active_plugins[i] != NULL; i++)
 		list = g_slist_prepend (list, active_plugins[i]);
@@ -90,42 +90,42 @@ save_active_plugin_list (GPEEngine *engine)
 }
 
 static void
-gedit_plugins_engine_activate_plugin (GPEEngine     *engine,
-				      GPEPluginInfo *info)
+gedit_plugins_engine_activate_plugin (PeasEngine     *engine,
+				      PeasPluginInfo *info)
 {
-	GPE_ENGINE_CLASS (gedit_plugins_engine_parent_class)->activate_plugin (engine, info);
+	PEAS_ENGINE_CLASS (gedit_plugins_engine_parent_class)->activate_plugin (engine, info);
 
 	/* We won't save the plugin list if we are currently activating the
 	   plugins from the saved list */
 	if (GEDIT_PLUGINS_ENGINE (engine)->priv->setting_active_plugins)
 		return;
 
-	if (gpe_plugin_info_is_active (info))
+	if (peas_plugin_info_is_active (info))
 		save_active_plugin_list (engine);
 }
 
 
 static void
-gedit_plugins_engine_deactivate_plugin (GPEEngine     *engine,
-					GPEPluginInfo *info)
+gedit_plugins_engine_deactivate_plugin (PeasEngine     *engine,
+					PeasPluginInfo *info)
 {
-	GPE_ENGINE_CLASS (gedit_plugins_engine_parent_class)->deactivate_plugin (engine, info);
+	PEAS_ENGINE_CLASS (gedit_plugins_engine_parent_class)->deactivate_plugin (engine, info);
 
 	/* We won't save the plugin list if we are currently deactivating
 	   plugins from the saved list */
 	if (GEDIT_PLUGINS_ENGINE (engine)->priv->setting_active_plugins)
 		return;
 
-	if (!gpe_plugin_info_is_active (info))
+	if (!peas_plugin_info_is_active (info))
 		save_active_plugin_list (engine);
 }
 
 static void
-gedit_plugins_engine_deactivate_plugin_on_object (GPEEngine     *engine,
-						  GPEPluginInfo *info,
+gedit_plugins_engine_deactivate_plugin_on_object (PeasEngine     *engine,
+						  PeasPluginInfo *info,
 						  GObject       *object)
 {
-	GPE_ENGINE_CLASS (gedit_plugins_engine_parent_class)->deactivate_plugin_on_object (engine, info, object);
+	PEAS_ENGINE_CLASS (gedit_plugins_engine_parent_class)->deactivate_plugin_on_object (engine, info, object);
 
 	/* ensure update of ui manager, because we suspect it does something
 	   with expected static strings in the type module (when unloaded the
@@ -146,7 +146,7 @@ static void
 gedit_plugins_engine_class_init (GeditPluginsEngineClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEEngineClass *engine_class = GPE_ENGINE_CLASS (klass);
+	PeasEngineClass *engine_class = PEAS_ENGINE_CLASS (klass);
 
 	object_class->finalize = gedit_plugins_engine_finalize;
 	engine_class->activate_plugin = gedit_plugins_engine_activate_plugin;
@@ -156,7 +156,7 @@ gedit_plugins_engine_class_init (GeditPluginsEngineClass *klass)
 	g_type_class_add_private (klass, sizeof (GeditPluginsEnginePrivate));
 }
 
-GPEEngine *
+PeasEngine *
 gedit_plugins_engine_get_default (void)
 {
 	gchar *modules_dir;
@@ -180,7 +180,7 @@ gedit_plugins_engine_get_default (void)
 	/* Ending NULL */
 	search_paths[4] = NULL;
 
-	default_engine = GPE_ENGINE (g_object_new (GEDIT_TYPE_PLUGINS_ENGINE,
+	default_engine = PEAS_ENGINE (g_object_new (GEDIT_TYPE_PLUGINS_ENGINE,
 						   "app-name", "Gedit",
 						   "base-module-dir", modules_dir,
 						   "search-paths", search_paths,
@@ -215,7 +215,7 @@ gedit_plugins_engine_active_plugins_changed (GeditPluginsEngine *engine)
 	*s = NULL;
 
 	engine->priv->setting_active_plugins = TRUE;
-	gpe_engine_set_active_plugins (GPE_ENGINE (engine), strv);
+	peas_engine_set_active_plugins (PEAS_ENGINE (engine), strv);
 	engine->priv->setting_active_plugins = FALSE;
 
 	g_free (strv);
diff --git a/gedit/gedit-plugins-engine.h b/gedit/gedit-plugins-engine.h
index 5733331..43e8967 100644
--- a/gedit/gedit-plugins-engine.h
+++ b/gedit/gedit-plugins-engine.h
@@ -33,7 +33,7 @@
 #define __GEDIT_PLUGINS_ENGINE_H__
 
 #include <glib.h>
-#include <libgpe/gpe-engine.h>
+#include <libpeas/peas-engine.h>
 
 G_BEGIN_DECLS
 
@@ -49,7 +49,7 @@ typedef struct _GeditPluginsEnginePrivate	GeditPluginsEnginePrivate;
 
 struct _GeditPluginsEngine
 {
-	GPEEngine parent;
+	PeasEngine parent;
 	GeditPluginsEnginePrivate *priv;
 };
 
@@ -57,11 +57,11 @@ typedef struct _GeditPluginsEngineClass		GeditPluginsEngineClass;
 
 struct _GeditPluginsEngineClass
 {
-	GPEEngineClass parent_class;
+	PeasEngineClass parent_class;
 };
 
 GType		 gedit_plugins_engine_get_type			(void) G_GNUC_CONST;
-GPEEngine	*gedit_plugins_engine_get_default		(void);
+PeasEngine	*gedit_plugins_engine_get_default		(void);
 
 /* private for gconf notification */
 void		 gedit_plugins_engine_active_plugins_changed	(GeditPluginsEngine *engine);
diff --git a/gedit/gedit-window.c b/gedit/gedit-window.c
index c0401eb..bf1a7e6 100644
--- a/gedit/gedit-window.c
+++ b/gedit/gedit-window.c
@@ -173,7 +173,7 @@ gedit_window_dispose (GObject *object)
 	/* First of all, force collection so that plugins
 	 * really drop some of the references.
 	 */
-	gpe_engine_garbage_collect (gedit_plugins_engine_get_default ());
+	peas_engine_garbage_collect (gedit_plugins_engine_get_default ());
 
 	/* save the panes position and make sure to deactivate plugins
 	 * for this window, but only once */
@@ -181,7 +181,7 @@ gedit_window_dispose (GObject *object)
 	{
 		save_panes_state (window);
 
-		gpe_engine_remove_object (gedit_plugins_engine_get_default (),
+		peas_engine_remove_object (gedit_plugins_engine_get_default (),
 					  G_OBJECT (window));
 		window->priv->dispose_has_run = TRUE;
 	}
@@ -230,7 +230,7 @@ gedit_window_dispose (GObject *object)
 	/* Now that there have broken some reference loops,
 	 * force collection again.
 	 */
-	gpe_engine_garbage_collect (gedit_plugins_engine_get_default ());
+	peas_engine_garbage_collect (gedit_plugins_engine_get_default ());
 
 	G_OBJECT_CLASS (gedit_window_parent_class)->dispose (object);
 }
@@ -323,7 +323,7 @@ static void
 gedit_window_tab_removed (GeditWindow *window,
 			  GeditTab    *tab) 
 {
-	gpe_engine_garbage_collect (gedit_plugins_engine_get_default ());
+	peas_engine_garbage_collect (gedit_plugins_engine_get_default ());
 }
 
 static void
@@ -825,7 +825,7 @@ set_sensitivity_according_to_tab (GeditWindow *window,
 
 	update_next_prev_doc_sensitivity (window, tab);
 
-	gpe_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
+	peas_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
 				      G_OBJECT (window));
 }
 
@@ -2695,7 +2695,7 @@ sync_name (GeditTab    *tab,
 	g_free (escaped_name);
 	g_free (tip);
 
-	gpe_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
+	peas_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
 				      G_OBJECT (window));
 }
 
@@ -3089,7 +3089,7 @@ selection_changed (GeditDocument *doc,
 				  editable &&
 				  gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (doc)));
 
-	gpe_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
+	peas_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
 				      G_OBJECT (window));
 }
 
@@ -3099,7 +3099,7 @@ sync_languages_menu (GeditDocument *doc,
 		     GeditWindow   *window)
 {
 	update_languages_menu (window);
-	gpe_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
+	peas_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
 				      G_OBJECT (window));
 }
 
@@ -3108,7 +3108,7 @@ editable_changed (GeditView  *view,
                   GParamSpec  *arg1,
                   GeditWindow *window)
 {
-	gpe_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
+	peas_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
 				      G_OBJECT (window));
 }
 
@@ -3313,7 +3313,7 @@ notebook_tab_removed (GeditNotebook *notebook,
 						      "ViewHighlightMode");
 		gtk_action_set_sensitive (action, FALSE);
 
-		gpe_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
+		peas_engine_update_plugins_ui (gedit_plugins_engine_get_default (),
 					      G_OBJECT (window));
 	}
 
@@ -3906,7 +3906,7 @@ gedit_window_init (GeditWindow *window)
 
 	gedit_debug_message (DEBUG_WINDOW, "Update plugins ui");
 	
-	gpe_engine_add_object (gedit_plugins_engine_get_default (),
+	peas_engine_add_object (gedit_plugins_engine_get_default (),
 			       G_OBJECT (window));
 
 	/* set visibility of panes.
diff --git a/gedit/gedit.c b/gedit/gedit.c
index f3bf5e1..64a5575 100644
--- a/gedit/gedit.c
+++ b/gedit/gedit.c
@@ -540,7 +540,7 @@ int
 main (int argc, char *argv[])
 {
 	GOptionContext *context;
-	GPEEngine *engine;
+	PeasEngine *engine;
 	GeditWindow *window;
 	GeditApp *app;
 	gboolean restored = FALSE;
diff --git a/plugins/changecase/gedit-changecase-plugin.c b/plugins/changecase/gedit-changecase-plugin.c
index 1e2a77d..3762da9 100644
--- a/plugins/changecase/gedit-changecase-plugin.c
+++ b/plugins/changecase/gedit-changecase-plugin.c
@@ -386,11 +386,11 @@ static void
 gedit_changecase_plugin_class_init (GeditChangecasePluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass *plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass *plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->finalize = gedit_changecase_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) impl_activate;
-	plugin_class->deactivate = (GPEFunc) impl_deactivate;
-	plugin_class->update_ui = (GPEFunc) impl_update_ui;
+	plugin_class->activate = (PeasFunc) impl_activate;
+	plugin_class->deactivate = (PeasFunc) impl_deactivate;
+	plugin_class->update_ui = (PeasFunc) impl_update_ui;
 }
diff --git a/plugins/changecase/gedit-changecase-plugin.h b/plugins/changecase/gedit-changecase-plugin.h
index 40bb793..a716ac7 100644
--- a/plugins/changecase/gedit-changecase-plugin.h
+++ b/plugins/changecase/gedit-changecase-plugin.h
@@ -65,7 +65,7 @@ struct _GeditChangecasePluginClass
 GType	gedit_changecase_plugin_get_type		(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/checkupdate/gedit-check-update-plugin.h b/plugins/checkupdate/gedit-check-update-plugin.h
index eed6167..4f63a32 100644
--- a/plugins/checkupdate/gedit-check-update-plugin.h
+++ b/plugins/checkupdate/gedit-check-update-plugin.h
@@ -67,7 +67,7 @@ struct _GeditCheckUpdatePluginClass
 GType	gedit_check_update_plugin_get_type	(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/docinfo/gedit-docinfo-plugin.c b/plugins/docinfo/gedit-docinfo-plugin.c
index 747aaf4..89d1f25 100644
--- a/plugins/docinfo/gedit-docinfo-plugin.c
+++ b/plugins/docinfo/gedit-docinfo-plugin.c
@@ -100,7 +100,7 @@ get_docinfo_dialog (GeditWindow *window,
 
 	dialog = g_new (DocInfoDialog, 1);
 
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (data->plugin));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (data->plugin));
 	ui_file = g_build_filename (data_dir, "docinfo.ui", NULL);
 	ret = gedit_utils_get_ui_objects (ui_file,
 					  NULL,
@@ -571,11 +571,11 @@ static void
 gedit_docinfo_plugin_class_init (GeditDocInfoPluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass *plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass *plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->finalize = gedit_docinfo_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) impl_activate;
-	plugin_class->deactivate = (GPEFunc) impl_deactivate;
-	plugin_class->update_ui = (GPEFunc) impl_update_ui;
+	plugin_class->activate = (PeasFunc) impl_activate;
+	plugin_class->deactivate = (PeasFunc) impl_deactivate;
+	plugin_class->update_ui = (PeasFunc) impl_update_ui;
 }
diff --git a/plugins/docinfo/gedit-docinfo-plugin.h b/plugins/docinfo/gedit-docinfo-plugin.h
index 92e13c2..62ec939 100644
--- a/plugins/docinfo/gedit-docinfo-plugin.h
+++ b/plugins/docinfo/gedit-docinfo-plugin.h
@@ -68,7 +68,7 @@ struct _GeditDocInfoPluginClass
 GType	gedit_docinfo_plugin_get_type		(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/filebrowser/gedit-file-browser-plugin.c b/plugins/filebrowser/gedit-file-browser-plugin.c
index ff55aeb..d85f38d 100644
--- a/plugins/filebrowser/gedit-file-browser-plugin.c
+++ b/plugins/filebrowser/gedit-file-browser-plugin.c
@@ -692,7 +692,7 @@ impl_activate (GeditPlugin * plugin, GeditWindow * window)
 
 	data = g_new0 (GeditFileBrowserPluginData, 1);
 	
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (plugin));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (plugin));
 	data->tree_widget = GEDIT_FILE_BROWSER_WIDGET (gedit_file_browser_widget_new (data_dir));
 	g_free (data_dir);
 
@@ -828,13 +828,13 @@ static void
 filetree_plugin_class_init (GeditFileBrowserPluginClass * klass)
 {
 	GObjectClass  *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass * plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass * plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->finalize = filetree_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) impl_activate;
-	plugin_class->deactivate = (GPEFunc) impl_deactivate;
-	plugin_class->update_ui = (GPEFunc) impl_updateui;
+	plugin_class->activate = (PeasFunc) impl_activate;
+	plugin_class->deactivate = (PeasFunc) impl_deactivate;
+	plugin_class->update_ui = (PeasFunc) impl_updateui;
 
 	g_type_class_add_private (object_class,
 				  sizeof (GeditFileBrowserPluginPrivate));
diff --git a/plugins/filebrowser/gedit-file-browser-plugin.h b/plugins/filebrowser/gedit-file-browser-plugin.h
index 116090a..b334f2d 100644
--- a/plugins/filebrowser/gedit-file-browser-plugin.h
+++ b/plugins/filebrowser/gedit-file-browser-plugin.h
@@ -63,7 +63,7 @@ struct _GeditFileBrowserPluginClass
 GType filetree_plugin_get_type              (void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule * module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule * module);
 
 G_END_DECLS
 #endif /* __GEDIT_FILE_BROWSER_PLUGIN_H__ */
diff --git a/plugins/indent/gedit-indent-plugin.c b/plugins/indent/gedit-indent-plugin.c
index abe3b37..3947748 100644
--- a/plugins/indent/gedit-indent-plugin.c
+++ b/plugins/indent/gedit-indent-plugin.c
@@ -323,11 +323,11 @@ static void
 gedit_indent_plugin_class_init (GeditIndentPluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass *plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass *plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->finalize = gedit_indent_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) impl_activate;
-	plugin_class->deactivate = (GPEFunc) impl_deactivate;
-	plugin_class->update_ui = (GPEFunc) impl_update_ui;
+	plugin_class->activate = (PeasFunc) impl_activate;
+	plugin_class->deactivate = (PeasFunc) impl_deactivate;
+	plugin_class->update_ui = (PeasFunc) impl_update_ui;
 }
diff --git a/plugins/indent/gedit-indent-plugin.h b/plugins/indent/gedit-indent-plugin.h
index 9623881..0b5f064 100644
--- a/plugins/indent/gedit-indent-plugin.h
+++ b/plugins/indent/gedit-indent-plugin.h
@@ -68,7 +68,7 @@ struct _GeditIndentPluginClass
 GType	gedit_indent_plugin_get_type		(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/modelines/gedit-modeline-plugin.c b/plugins/modelines/gedit-modeline-plugin.c
index f3ba0e0..a33dec5 100644
--- a/plugins/modelines/gedit-modeline-plugin.c
+++ b/plugins/modelines/gedit-modeline-plugin.c
@@ -70,13 +70,13 @@ static void
 gedit_modeline_plugin_class_init (GeditModelinePluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass *plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass *plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->constructor = gedit_modeline_plugin_constructor;
 	object_class->finalize = gedit_modeline_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) gedit_modeline_plugin_activate;
-	plugin_class->deactivate = (GPEFunc) gedit_modeline_plugin_deactivate;
+	plugin_class->activate = (PeasFunc) gedit_modeline_plugin_activate;
+	plugin_class->deactivate = (PeasFunc) gedit_modeline_plugin_deactivate;
 }
 
 static GObject *
@@ -91,7 +91,7 @@ gedit_modeline_plugin_constructor (GType                  type,
 										   n_construct_properties,
 										   construct_param);
 
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (object));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (object));
 
 	modeline_parser_init (data_dir);
 
diff --git a/plugins/modelines/gedit-modeline-plugin.h b/plugins/modelines/gedit-modeline-plugin.h
index 3f3cf00..a672c22 100644
--- a/plugins/modelines/gedit-modeline-plugin.h
+++ b/plugins/modelines/gedit-modeline-plugin.h
@@ -41,7 +41,7 @@ typedef GeditPlugin		GeditModelinePlugin;
 
 GType	gedit_modeline_plugin_get_type		(void) G_GNUC_CONST;
 
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/sort/gedit-sort-plugin.c b/plugins/sort/gedit-sort-plugin.c
index 9a05b73..b197d78 100644
--- a/plugins/sort/gedit-sort-plugin.c
+++ b/plugins/sort/gedit-sort-plugin.c
@@ -138,7 +138,7 @@ get_sort_dialog (ActionData *action_data)
 
 	dialog = g_slice_new (SortDialog);
 
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (action_data->plugin));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (action_data->plugin));
 	ui_file = g_build_filename (data_dir, "sort.ui", NULL);
 	g_free (data_dir);
 	ret = gedit_utils_get_ui_objects (ui_file,
@@ -560,11 +560,11 @@ static void
 gedit_sort_plugin_class_init (GeditSortPluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass *plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass *plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->finalize = gedit_sort_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) impl_activate;
-	plugin_class->deactivate = (GPEFunc) impl_deactivate;
-	plugin_class->update_ui = (GPEFunc) impl_update_ui;
+	plugin_class->activate = (PeasFunc) impl_activate;
+	plugin_class->deactivate = (PeasFunc) impl_deactivate;
+	plugin_class->update_ui = (PeasFunc) impl_update_ui;
 }
diff --git a/plugins/sort/gedit-sort-plugin.h b/plugins/sort/gedit-sort-plugin.h
index 64b06b4..90abf49 100644
--- a/plugins/sort/gedit-sort-plugin.h
+++ b/plugins/sort/gedit-sort-plugin.h
@@ -66,7 +66,7 @@ struct _GeditSortPluginClass
 GType	gedit_sort_plugin_get_type		(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/spell/gedit-spell-plugin.c b/plugins/spell/gedit-spell-plugin.c
index 130cd2f..c37f96b 100644
--- a/plugins/spell/gedit-spell-plugin.c
+++ b/plugins/spell/gedit-spell-plugin.c
@@ -702,7 +702,7 @@ set_language_cb (GtkAction   *action,
 
 	lang = gedit_spell_checker_get_language (spell);
 
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (action_data->plugin));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (action_data->plugin));
 	dlg = gedit_spell_language_dialog_new (GTK_WINDOW (action_data->window),
 					       lang,
 					       data_dir);
@@ -795,7 +795,7 @@ spell_cb (GtkAction   *action,
 		return;
 	}
 
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (action_data->plugin));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (action_data->plugin));
 	dlg = gedit_spell_checker_dialog_new_from_spell_checker (spell, data_dir);
 	g_free (data_dir);
 	gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);
@@ -1015,13 +1015,13 @@ static void
 gedit_spell_plugin_class_init (GeditSpellPluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass *plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass *plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->finalize = gedit_spell_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) impl_activate;
-	plugin_class->deactivate = (GPEFunc) impl_deactivate;
-	plugin_class->update_ui = (GPEFunc) impl_update_ui;
+	plugin_class->activate = (PeasFunc) impl_activate;
+	plugin_class->deactivate = (PeasFunc) impl_deactivate;
+	plugin_class->update_ui = (PeasFunc) impl_update_ui;
 
 	if (spell_checker_id == 0)
 		spell_checker_id = g_quark_from_string ("GeditSpellCheckerID");
diff --git a/plugins/spell/gedit-spell-plugin.h b/plugins/spell/gedit-spell-plugin.h
index 97754df..b96f36e 100644
--- a/plugins/spell/gedit-spell-plugin.h
+++ b/plugins/spell/gedit-spell-plugin.h
@@ -68,7 +68,7 @@ struct _GeditSpellPluginClass
 GType	gedit_spell_plugin_get_type		(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/taglist/gedit-taglist-plugin.c b/plugins/taglist/gedit-taglist-plugin.c
index 397ac0f..d0b7a34 100644
--- a/plugins/taglist/gedit-taglist-plugin.c
+++ b/plugins/taglist/gedit-taglist-plugin.c
@@ -89,7 +89,7 @@ impl_activate (GeditPlugin *plugin,
 	
 	side_panel = gedit_window_get_side_panel (window);
 	
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (plugin));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (plugin));
 	taglist_panel = gedit_taglist_plugin_panel_new (window, data_dir);
 	g_free (data_dir);
 	
@@ -148,13 +148,13 @@ static void
 gedit_taglist_plugin_class_init (GeditTaglistPluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass *plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass *plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->finalize = gedit_taglist_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) impl_activate;
-	plugin_class->deactivate = (GPEFunc) impl_deactivate;
-	plugin_class->update_ui = (GPEFunc) impl_update_ui;
+	plugin_class->activate = (PeasFunc) impl_activate;
+	plugin_class->deactivate = (PeasFunc) impl_deactivate;
+	plugin_class->update_ui = (PeasFunc) impl_update_ui;
 
 	g_type_class_add_private (object_class, sizeof (GeditTaglistPluginPrivate));
 }
diff --git a/plugins/taglist/gedit-taglist-plugin.h b/plugins/taglist/gedit-taglist-plugin.h
index 56f1ca6..cf6c51a 100644
--- a/plugins/taglist/gedit-taglist-plugin.h
+++ b/plugins/taglist/gedit-taglist-plugin.h
@@ -78,7 +78,7 @@ struct _GeditTaglistPluginClass
 GType	gedit_taglist_plugin_get_type		(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
 
diff --git a/plugins/time/gedit-time-plugin.c b/plugins/time/gedit-time-plugin.c
index cae07d0..a88b68c 100644
--- a/plugins/time/gedit-time-plugin.c
+++ b/plugins/time/gedit-time-plugin.c
@@ -785,7 +785,7 @@ get_configure_dialog (GeditTimePlugin *plugin)
 
 	g_return_val_if_fail (dialog->dialog != NULL, NULL);
 
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (plugin));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (plugin));
 	ui_file = g_build_filename (data_dir, "gedit-time-setup-dialog.ui", NULL);
 	ret = gedit_utils_get_ui_objects (ui_file,
 					  root_objects,
@@ -944,7 +944,7 @@ get_choose_format_dialog (GtkWindow                 *parent,
 
 	dialog = g_new0 (ChooseFormatDialog, 1);
 
-	data_dir = gpe_plugin_get_data_dir (GPE_PLUGIN (plugin));
+	data_dir = peas_plugin_get_data_dir (PEAS_PLUGIN (plugin));
 	ui_file = g_build_filename (data_dir, "gedit-time-dialog.ui", NULL);
 	ret = gedit_utils_get_ui_objects (ui_file,
 					  NULL,
@@ -1238,7 +1238,7 @@ configure_dialog_response_cb (GtkWidget           *widget,
 }
 
 static GtkWidget *
-impl_create_configure_dialog (GPEPlugin *plugin)
+impl_create_configure_dialog (PeasPlugin *plugin)
 {
 	TimeConfigureDialog *dialog;
 
@@ -1258,13 +1258,13 @@ static void
 gedit_time_plugin_class_init (GeditTimePluginClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GPEPluginClass *plugin_class = GPE_PLUGIN_CLASS (klass);
+	PeasPluginClass *plugin_class = PEAS_PLUGIN_CLASS (klass);
 
 	object_class->finalize = gedit_time_plugin_finalize;
 
-	plugin_class->activate = (GPEFunc) impl_activate;
-	plugin_class->deactivate = (GPEFunc) impl_deactivate;
-	plugin_class->update_ui = (GPEFunc) impl_update_ui;
+	plugin_class->activate = (PeasFunc) impl_activate;
+	plugin_class->deactivate = (PeasFunc) impl_deactivate;
+	plugin_class->update_ui = (PeasFunc) impl_update_ui;
 
 	plugin_class->create_configure_dialog = impl_create_configure_dialog;
 
diff --git a/plugins/time/gedit-time-plugin.h b/plugins/time/gedit-time-plugin.h
index e256821..8bc3185 100644
--- a/plugins/time/gedit-time-plugin.h
+++ b/plugins/time/gedit-time-plugin.h
@@ -71,7 +71,7 @@ struct _GeditTimePluginClass
 GType	gedit_time_plugin_get_type		(void) G_GNUC_CONST;
 
 /* All the plugins must implement this function */
-G_MODULE_EXPORT GType register_gpe_plugin (GTypeModule *module);
+G_MODULE_EXPORT GType register_peas_plugin (GTypeModule *module);
 
 G_END_DECLS
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]