GNOME.org
 

[gedit] Port to latest api changes in libpeas.

commit 1d56b827f14096891bb03dbd5e8211fdad1331ad
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sun Oct 3 19:47:59 2010 +0200

    Port to latest api changes in libpeas.

 gedit/gedit-plugins-engine.c                       |  121 +++++++++-----------
 plugins/changecase/Makefile.am                     |    6 +-
 ...gin.desktop.in => changecase.plugin.desktop.in} |    2 +-
 plugins/checkupdate/Makefile.am                    |    6 +-
 ...in.desktop.in => checkupdate.plugin.desktop.in} |    2 +-
 plugins/docinfo/Makefile.am                        |    6 +-
 ...plugin.desktop.in => docinfo.plugin.desktop.in} |    2 +-
 plugins/externaltools/Makefile.am                  |    6 +-
 ....desktop.in => externaltools.plugin.desktop.in} |    2 +-
 plugins/filebrowser/Makefile.am                    |    6 +-
 ...in.desktop.in => filebrowser.plugin.desktop.in} |    2 +-
 plugins/modelines/Makefile.am                      |    6 +-
 ...ugin.desktop.in => modelines.plugin.desktop.in} |    2 +-
 plugins/pythonconsole/Makefile.am                  |    6 +-
 ....desktop.in => pythonconsole.plugin.desktop.in} |    2 +-
 plugins/quickopen/Makefile.am                      |    6 +-
 ...ugin.desktop.in => quickopen.plugin.desktop.in} |    2 +-
 plugins/snippets/Makefile.am                       |    6 +-
 ...lugin.desktop.in => snippets.plugin.desktop.in} |    2 +-
 plugins/sort/Makefile.am                           |    6 +-
 ...it-plugin.desktop.in => sort.plugin.desktop.in} |    2 +-
 plugins/spell/Makefile.am                          |    6 +-
 ...t-plugin.desktop.in => spell.plugin.desktop.in} |    2 +-
 plugins/taglist/Makefile.am                        |    9 +-
 ...plugin.desktop.in => taglist.plugin.desktop.in} |    2 +-
 plugins/time/Makefile.am                           |    6 +-
 ...it-plugin.desktop.in => time.plugin.desktop.in} |    2 +-
 27 files changed, 108 insertions(+), 120 deletions(-)
---
diff --git a/gedit/gedit-plugins-engine.c b/gedit/gedit-plugins-engine.c
index c628e8e..807bbc2 100644
--- a/gedit/gedit-plugins-engine.c
+++ b/gedit/gedit-plugins-engine.c
@@ -57,13 +57,62 @@ GeditPluginsEngine *default_engine = NULL;
 static void
 gedit_plugins_engine_init (GeditPluginsEngine *engine)
 {
+	gchar *typelib_dir;
+	GError *error = NULL;
+
 	gedit_debug (DEBUG_PLUGINS);
 
 	engine->priv = G_TYPE_INSTANCE_GET_PRIVATE (engine,
-						    GEDIT_TYPE_PLUGINS_ENGINE,
-						    GeditPluginsEnginePrivate);
+	                                            GEDIT_TYPE_PLUGINS_ENGINE,
+	                                            GeditPluginsEnginePrivate);
 
 	engine->priv->plugin_settings = g_settings_new ("org.gnome.gedit.plugins");
+	
+	/* Require gedit's typelib. */
+	typelib_dir = g_build_filename (gedit_dirs_get_gedit_lib_dir (),
+	                                "girepository-1.0",
+	                                NULL);
+
+	if (!g_irepository_require_private (g_irepository_get_default (),
+	                                    typelib_dir, "Gedit", "3.0", 0, &error))
+	{
+		g_warning ("Could not load Gedit repository: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
+
+	g_free (typelib_dir);
+
+	/* This should be moved to libpeas */
+	if (!g_irepository_require (g_irepository_get_default (),
+	                            "Peas", "1.0", 0, &error))
+	{
+		g_warning ("Could not load Peas repository: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
+
+	if (!g_irepository_require (g_irepository_get_default (),
+	                            "PeasGtk", "1.0", 0, &error))
+	{
+		g_warning ("Could not load PeasGtk repository: %s", error->message);
+		g_error_free (error);
+		error = NULL;
+	}
+	
+	peas_engine_add_search_path (PEAS_ENGINE (engine),
+	                             gedit_dirs_get_user_plugins_dir (),
+	                             gedit_dirs_get_user_plugins_dir ());
+
+	peas_engine_add_search_path (PEAS_ENGINE (engine),
+	                             gedit_dirs_get_gedit_plugins_dir (),
+	                             gedit_dirs_get_gedit_plugins_data_dir ());
+
+	g_settings_bind (engine->priv->plugin_settings,
+	                 GEDIT_SETTINGS_ACTIVE_PLUGINS,
+	                 engine,
+	                 "loaded-plugins",
+	                 G_SETTINGS_BIND_DEFAULT);
 }
 
 static void
@@ -93,73 +142,15 @@ gedit_plugins_engine_class_init (GeditPluginsEngineClass *klass)
 GeditPluginsEngine *
 gedit_plugins_engine_get_default (void)
 {
-	gchar *typelib_dir;
-	const gchar **search_paths;
-	GError *error = NULL;
-
-	if (default_engine != NULL)
+	if (default_engine == NULL)
 	{
-		return default_engine;
-	}
-
-	/* Require gedit's typelib. */
-	typelib_dir = g_build_filename (gedit_dirs_get_gedit_lib_dir (),
-					"girepository-1.0",
-					NULL);
+		default_engine = GEDIT_PLUGINS_ENGINE (g_object_new (GEDIT_TYPE_PLUGINS_ENGINE,
+		                                                     NULL));
 
-	if (!g_irepository_require_private (g_irepository_get_default (),
-					    typelib_dir, "Gedit", "3.0", 0, &error))
-	{
-		g_warning ("Could not load Gedit repository: %s", error->message);
-		g_error_free (error);
-		error = NULL;
+		g_object_add_weak_pointer (G_OBJECT (default_engine),
+		                           (gpointer) &default_engine);
 	}
 
-	g_free (typelib_dir);
-
-	/* This should be moved to libpeas */
-	if (!g_irepository_require (g_irepository_get_default (),
-				    "Peas", "1.0", 0, &error))
-	{
-		g_warning ("Could not load Peas repository: %s", error->message);
-		g_error_free (error);
-		error = NULL;
-	}
-
-	if (!g_irepository_require (g_irepository_get_default (),
-				    "PeasGtk", "1.0", 0, &error))
-	{
-		g_warning ("Could not load PeasGtk repository: %s", error->message);
-		g_error_free (error);
-		error = NULL;
-	}
-
-	search_paths = g_new (const gchar *, 5);
-	/* Add the user plugins dir in ~ */
-	search_paths[0] = gedit_dirs_get_user_plugins_dir ();
-	search_paths[1] = gedit_dirs_get_user_plugins_dir ();
-	/* Add the system plugins dir */
-	search_paths[2] = gedit_dirs_get_gedit_plugins_dir ();
-	search_paths[3] = gedit_dirs_get_gedit_plugins_data_dir ();
-	/* Add the trailing NULL */
-	search_paths[4] = NULL;
-
-	default_engine = GEDIT_PLUGINS_ENGINE (g_object_new (GEDIT_TYPE_PLUGINS_ENGINE,
-							     "app-name", "Gedit",
-							     "search-paths", search_paths,
-							     NULL));
-
-	g_free (search_paths);
-
-	g_object_add_weak_pointer (G_OBJECT (default_engine),
-				   (gpointer) &default_engine);
-
-	g_settings_bind (default_engine->priv->plugin_settings,
-	                 GEDIT_SETTINGS_ACTIVE_PLUGINS,
-	                 default_engine,
-	                 "loaded-plugins",
-	                 G_SETTINGS_BIND_DEFAULT);
-
 	return default_engine;
 }
 
diff --git a/plugins/changecase/Makefile.am b/plugins/changecase/Makefile.am
index 1f165f9..d0af857 100644
--- a/plugins/changecase/Makefile.am
+++ b/plugins/changecase/Makefile.am
@@ -19,11 +19,11 @@ libchangecase_la_LIBADD = $(GEDIT_LIBS)
 uidir = $(GEDIT_PLUGINS_DATA_DIR)/changecase
 ui_DATA =
 
-plugin_in_files = changecase.gedit-plugin.desktop.in
+plugin_in_files = changecase.plugin.desktop.in
 
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
 
diff --git a/plugins/changecase/changecase.gedit-plugin.desktop.in b/plugins/changecase/changecase.plugin.desktop.in
similarity index 93%
rename from plugins/changecase/changecase.gedit-plugin.desktop.in
rename to plugins/changecase/changecase.plugin.desktop.in
index 45af308..0bd024a 100644
--- a/plugins/changecase/changecase.gedit-plugin.desktop.in
+++ b/plugins/changecase/changecase.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Module=changecase
 IAge=3
 _Name=Change Case
diff --git a/plugins/checkupdate/Makefile.am b/plugins/checkupdate/Makefile.am
index 1a98d72..94a6600 100644
--- a/plugins/checkupdate/Makefile.am
+++ b/plugins/checkupdate/Makefile.am
@@ -18,11 +18,11 @@ libcheckupdate_la_SOURCES = \
 libcheckupdate_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libcheckupdate_la_LIBADD = $(GEDIT_LIBS) $(LIBSOUP_LIBS)
 
-plugin_in_files = checkupdate.gedit-plugin.desktop.in
+plugin_in_files = checkupdate.plugin.desktop.in
 
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 gsettings_SCHEMAS = org.gnome.gedit.plugins.checkupdate.gschema.xml
 
diff --git a/plugins/checkupdate/checkupdate.gedit-plugin.desktop.in b/plugins/checkupdate/checkupdate.plugin.desktop.in
similarity index 93%
rename from plugins/checkupdate/checkupdate.gedit-plugin.desktop.in
rename to plugins/checkupdate/checkupdate.plugin.desktop.in
index 88e8042..9defa71 100644
--- a/plugins/checkupdate/checkupdate.gedit-plugin.desktop.in
+++ b/plugins/checkupdate/checkupdate.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Module=checkupdate
 IAge=3
 _Name=Check update
diff --git a/plugins/docinfo/Makefile.am b/plugins/docinfo/Makefile.am
index eadd23e..fd7ad77 100644
--- a/plugins/docinfo/Makefile.am
+++ b/plugins/docinfo/Makefile.am
@@ -19,11 +19,11 @@ libdocinfo_la_LIBADD  = $(GEDIT_LIBS)
 uidir = $(GEDIT_PLUGINS_DATA_DIR)/docinfo
 ui_DATA = gedit-docinfo-plugin.ui
 
-plugin_in_files = docinfo.gedit-plugin.desktop.in
+plugin_in_files = docinfo.plugin.desktop.in
 
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
 
diff --git a/plugins/docinfo/docinfo.gedit-plugin.desktop.in b/plugins/docinfo/docinfo.plugin.desktop.in
similarity index 95%
rename from plugins/docinfo/docinfo.gedit-plugin.desktop.in
rename to plugins/docinfo/docinfo.plugin.desktop.in
index 7beebfd..d220800 100644
--- a/plugins/docinfo/docinfo.gedit-plugin.desktop.in
+++ b/plugins/docinfo/docinfo.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Module=docinfo
 IAge=3
 _Name=Document Statistics
diff --git a/plugins/externaltools/Makefile.am b/plugins/externaltools/Makefile.am
index f529640..7ee009e 100644
--- a/plugins/externaltools/Makefile.am
+++ b/plugins/externaltools/Makefile.am
@@ -2,10 +2,10 @@
 SUBDIRS = tools data scripts
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-plugin_in_files = externaltools.gedit-plugin.desktop.in
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+plugin_in_files = externaltools.plugin.desktop.in
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(plugin_in_files)
 
diff --git a/plugins/externaltools/externaltools.gedit-plugin.desktop.in b/plugins/externaltools/externaltools.plugin.desktop.in
similarity index 94%
rename from plugins/externaltools/externaltools.gedit-plugin.desktop.in
rename to plugins/externaltools/externaltools.plugin.desktop.in
index 5f3adcc..c56e4e3 100644
--- a/plugins/externaltools/externaltools.gedit-plugin.desktop.in
+++ b/plugins/externaltools/externaltools.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Loader=python
 Module=externaltools
 IAge=3
diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index ac37999..7acdadf 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -44,9 +44,9 @@ libfilebrowser_la_LIBADD = $(GEDIT_LIBS)
 uidir = $(GEDIT_PLUGINS_DATA_DIR)/filebrowser
 ui_DATA = gedit-file-browser-widget-ui.xml
 
-plugin_in_files = filebrowser.gedit-plugin.desktop.in
+plugin_in_files = filebrowser.plugin.desktop.in
 
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 gedit-file-browser-enum-types.h: gedit-file-browser-enum-types.h.template $(NOINST_H_FILES) $(GLIB_MKENUMS)
 	(cd $(srcdir) && $(GLIB_MKENUMS) --template gedit-file-browser-enum-types.h.template $(NOINST_H_FILES)) > $@
@@ -63,7 +63,7 @@ gedit-file-browser-marshal.c: gedit-file-browser-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN) echo "#include \"gedit-file-browser-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=gedit_file_browser_marshal >> $@
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 gsettings_ENUM_NAMESPACE = org.gnome.gedit.plugins.filebrowser
 gsettings_ENUM_FILES = $(top_srcdir)/plugins/filebrowser/*.h
diff --git a/plugins/filebrowser/filebrowser.gedit-plugin.desktop.in b/plugins/filebrowser/filebrowser.plugin.desktop.in
similarity index 94%
rename from plugins/filebrowser/filebrowser.gedit-plugin.desktop.in
rename to plugins/filebrowser/filebrowser.plugin.desktop.in
index 0ebce9b..48b65cf 100644
--- a/plugins/filebrowser/filebrowser.gedit-plugin.desktop.in
+++ b/plugins/filebrowser/filebrowser.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Loader=C
 Module=filebrowser
 IAge=3
diff --git a/plugins/modelines/Makefile.am b/plugins/modelines/Makefile.am
index ddcfccc..72c2701 100644
--- a/plugins/modelines/Makefile.am
+++ b/plugins/modelines/Makefile.am
@@ -22,10 +22,10 @@ libmodelines_la_SOURCES = \
 libmodelines_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libmodelines_la_LIBADD  = $(GEDIT_LIBS)
 
-plugin_in_files = modelines.gedit-plugin.desktop.in
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+plugin_in_files = modelines.plugin.desktop.in
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = \
 	$(plugin_in_files)				\
diff --git a/plugins/modelines/modelines.gedit-plugin.desktop.in b/plugins/modelines/modelines.plugin.desktop.in
similarity index 93%
rename from plugins/modelines/modelines.gedit-plugin.desktop.in
rename to plugins/modelines/modelines.plugin.desktop.in
index e67ff2b..ccb2781 100644
--- a/plugins/modelines/modelines.gedit-plugin.desktop.in
+++ b/plugins/modelines/modelines.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Module=modelines
 IAge=3
 _Name=Modelines
diff --git a/plugins/pythonconsole/Makefile.am b/plugins/pythonconsole/Makefile.am
index 4707989..650c298 100644
--- a/plugins/pythonconsole/Makefile.am
+++ b/plugins/pythonconsole/Makefile.am
@@ -2,10 +2,10 @@
 SUBDIRS = pythonconsole
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-plugin_in_files = pythonconsole.gedit-plugin.desktop.in
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+plugin_in_files = pythonconsole.plugin.desktop.in
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 gsettings_SCHEMAS = org.gnome.gedit.plugins.pythonconsole.gschema.xml
 
diff --git a/plugins/pythonconsole/pythonconsole.gedit-plugin.desktop.in b/plugins/pythonconsole/pythonconsole.plugin.desktop.in
similarity index 94%
rename from plugins/pythonconsole/pythonconsole.gedit-plugin.desktop.in
rename to plugins/pythonconsole/pythonconsole.plugin.desktop.in
index 75ec3ac..4309667 100644
--- a/plugins/pythonconsole/pythonconsole.gedit-plugin.desktop.in
+++ b/plugins/pythonconsole/pythonconsole.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Loader=python
 Module=pythonconsole
 IAge=3
diff --git a/plugins/quickopen/Makefile.am b/plugins/quickopen/Makefile.am
index 4b5faf0..bda47ba 100644
--- a/plugins/quickopen/Makefile.am
+++ b/plugins/quickopen/Makefile.am
@@ -2,10 +2,10 @@
 SUBDIRS = quickopen
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-plugin_in_files = quickopen.gedit-plugin.desktop.in
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+plugin_in_files = quickopen.plugin.desktop.in
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(plugin_in_files)
 
diff --git a/plugins/quickopen/quickopen.gedit-plugin.desktop.in b/plugins/quickopen/quickopen.plugin.desktop.in
similarity index 93%
rename from plugins/quickopen/quickopen.gedit-plugin.desktop.in
rename to plugins/quickopen/quickopen.plugin.desktop.in
index 70aea23..17edecc 100644
--- a/plugins/quickopen/quickopen.gedit-plugin.desktop.in
+++ b/plugins/quickopen/quickopen.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Loader=python
 Module=quickopen
 IAge=3
diff --git a/plugins/snippets/Makefile.am b/plugins/snippets/Makefile.am
index 06f0009..fbcd591 100644
--- a/plugins/snippets/Makefile.am
+++ b/plugins/snippets/Makefile.am
@@ -2,10 +2,10 @@
 SUBDIRS = snippets data
 plugindir = $(GEDIT_PLUGINS_LIBS_DIR)
 
-plugin_in_files = snippets.gedit-plugin.desktop.in
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+plugin_in_files = snippets.plugin.desktop.in
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(plugin_in_files)
 
diff --git a/plugins/snippets/snippets.gedit-plugin.desktop.in b/plugins/snippets/snippets.plugin.desktop.in
similarity index 94%
rename from plugins/snippets/snippets.gedit-plugin.desktop.in
rename to plugins/snippets/snippets.plugin.desktop.in
index 1d0436b..f41a626 100644
--- a/plugins/snippets/snippets.gedit-plugin.desktop.in
+++ b/plugins/snippets/snippets.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Loader=python
 Module=snippets
 IAge=3
diff --git a/plugins/sort/Makefile.am b/plugins/sort/Makefile.am
index b0eb347..5d8a885 100644
--- a/plugins/sort/Makefile.am
+++ b/plugins/sort/Makefile.am
@@ -19,11 +19,11 @@ libsort_la_LIBADD  = $(GEDIT_LIBS)
 uidir = $(GEDIT_PLUGINS_DATA_DIR)/sort
 ui_DATA = gedit-sort-plugin.ui
 
-plugin_in_files = sort.gedit-plugin.desktop.in
+plugin_in_files = sort.plugin.desktop.in
 
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = $(ui_DATA) $(plugin_in_files)
 
diff --git a/plugins/sort/sort.gedit-plugin.desktop.in b/plugins/sort/sort.plugin.desktop.in
similarity index 96%
rename from plugins/sort/sort.gedit-plugin.desktop.in
rename to plugins/sort/sort.plugin.desktop.in
index fd5c03e..0fbe204 100644
--- a/plugins/sort/sort.gedit-plugin.desktop.in
+++ b/plugins/sort/sort.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Module=sort
 IAge=3
 _Name=Sort
diff --git a/plugins/spell/Makefile.am b/plugins/spell/Makefile.am
index 9d332f9..0fa8f54 100644
--- a/plugins/spell/Makefile.am
+++ b/plugins/spell/Makefile.am
@@ -44,11 +44,11 @@ gedit-spell-marshal.c: gedit-spell-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN) echo "#include \"gedit-spell-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=gedit_marshal >> $@
 
-plugin_in_files = spell.gedit-plugin.desktop.in
+plugin_in_files = spell.plugin.desktop.in
 
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = 					\
 	$(ui_DATA)				\
diff --git a/plugins/spell/spell.gedit-plugin.desktop.in b/plugins/spell/spell.plugin.desktop.in
similarity index 93%
rename from plugins/spell/spell.gedit-plugin.desktop.in
rename to plugins/spell/spell.plugin.desktop.in
index 797aa61..c03830f 100644
--- a/plugins/spell/spell.gedit-plugin.desktop.in
+++ b/plugins/spell/spell.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Module=spell
 IAge=3
 _Name=Spell Checker
diff --git a/plugins/taglist/Makefile.am b/plugins/taglist/Makefile.am
index b04f458..5138425 100644
--- a/plugins/taglist/Makefile.am
+++ b/plugins/taglist/Makefile.am
@@ -30,9 +30,9 @@ libtaglist_la_SOURCES = \
 libtaglist_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libtaglist_la_LIBADD  = $(GEDIT_LIBS)
 
-plugin_in_files = taglist.gedit-plugin.desktop.in
+plugin_in_files = taglist.plugin.desktop.in
 
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po)
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po)
 	$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
 GZIP_ENV = -9
@@ -41,7 +41,7 @@ GZIP_ENV = -9
 	LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $(@:.gz=) -x -u -c $(top_builddir)/po/.intltool-merge-cache
 	GZIP=$(GZIP_ENV) gzip -f $(@:.gz=)
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 EXTRA_DIST = \
 	$(taglist_in_files) $(taglist_DATA)	\
@@ -54,7 +54,4 @@ DISTCLEANFILES = \
 	$(taglist_DATA)	\
 	$(plugin_DATA)
 
-
-
-
 -include $(top_srcdir)/git.mk
diff --git a/plugins/taglist/taglist.gedit-plugin.desktop.in b/plugins/taglist/taglist.plugin.desktop.in
similarity index 94%
rename from plugins/taglist/taglist.gedit-plugin.desktop.in
rename to plugins/taglist/taglist.plugin.desktop.in
index a3b8e39..0a8e509 100644
--- a/plugins/taglist/taglist.gedit-plugin.desktop.in
+++ b/plugins/taglist/taglist.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Module=taglist
 IAge=3
 _Name=Tag list
diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am
index c92b39f..a03cddc 100644
--- a/plugins/time/Makefile.am
+++ b/plugins/time/Makefile.am
@@ -21,11 +21,11 @@ ui_DATA = \
 	gedit-time-dialog.ui				\
 	gedit-time-setup-dialog.ui
 
-plugin_in_files = time.gedit-plugin.desktop.in
+plugin_in_files = time.plugin.desktop.in
 
-%.gedit-plugin: %.gedit-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+%.plugin: %.plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
 
-plugin_DATA = $(plugin_in_files:.gedit-plugin.desktop.in=.gedit-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 gsettings_ENUM_NAMESPACE = org.gnome.gedit.plugins.time
 gsettings_ENUM_FILES = $(top_srcdir)/plugins/time/gedit-time-plugin.c
diff --git a/plugins/time/time.gedit-plugin.desktop.in b/plugins/time/time.plugin.desktop.in
similarity index 94%
rename from plugins/time/time.gedit-plugin.desktop.in
rename to plugins/time/time.plugin.desktop.in
index e532c35..4cbd725 100644
--- a/plugins/time/time.gedit-plugin.desktop.in
+++ b/plugins/time/time.plugin.desktop.in
@@ -1,4 +1,4 @@
-[Gedit Plugin]
+[Plugin]
 Module=time
 IAge=3
 _Name=Insert Date/Time
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]