From e1fbe56adf49a5f4d3a3bb493933d9ae5a5c081f Mon Sep 17 00:00:00 2001
From: monsta <monsta@inbox.ru>
Date: Mon, 5 Dec 2016 17:36:57 +0300
Subject: plugins: make them actually recognized and loaded by Pluma

- use *.plugin extension instead of *.pluma-plugin
- use "Plugin" section name instead of "Pluma Plugin"

mostly adapted from:
https://git.gnome.org/browse/gedit/commit/?id=1d56b827f14096891bb03dbd5e8211fdad1331ad
https://git.gnome.org/browse/gedit/commit/?id=7c22769d73f756b9d1388febd147c9d267ed54cb
---
 plugins/filebrowser/Makefile.am                         |  6 +++---
 plugins/filebrowser/filebrowser.plugin.desktop.in       | 10 ++++++++++
 plugins/filebrowser/filebrowser.pluma-plugin.desktop.in | 10 ----------
 3 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 plugins/filebrowser/filebrowser.plugin.desktop.in
 delete mode 100644 plugins/filebrowser/filebrowser.pluma-plugin.desktop.in

(limited to 'plugins/filebrowser')

diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am
index 3b494cdf..faa554ec 100644
--- a/plugins/filebrowser/Makefile.am
+++ b/plugins/filebrowser/Makefile.am
@@ -44,9 +44,9 @@ libfilebrowser_la_LIBADD = $(PLUMA_LIBS)
 uidir = $(PLUMA_PLUGINS_DATA_DIR)/filebrowser
 ui_DATA = pluma-file-browser-widget-ui.xml
 
-plugin_in_files = filebrowser.pluma-plugin.desktop.in
+plugin_in_files = filebrowser.plugin.desktop.in
 
-%.pluma-plugin: %.pluma-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
 
 pluma-file-browser-enum-types.h: pluma-file-browser-enum-types.h.template $(NOINST_H_FILES) $(GLIB_MKENUMS)
 	(cd $(srcdir) && $(GLIB_MKENUMS) --template pluma-file-browser-enum-types.h.template $(NOINST_H_FILES)) > $@
@@ -63,7 +63,7 @@ pluma-file-browser-marshal.c: pluma-file-browser-marshal.list $(GLIB_GENMARSHAL)
 	$(AM_V_GEN) echo "#include \"pluma-file-browser-marshal.h\"" > $@ && \
 	$(GLIB_GENMARSHAL) $< --body --prefix=pluma_file_browser_marshal >> $@
 
-plugin_DATA = $(plugin_in_files:.pluma-plugin.desktop.in=.pluma-plugin)
+plugin_DATA = $(plugin_in_files:.plugin.desktop.in=.plugin)
 
 @INTLTOOL_XML_NOMERGE_RULE@
 filebrowser_gschema_in = org.mate.pluma.plugins.filebrowser.gschema.xml.in
diff --git a/plugins/filebrowser/filebrowser.plugin.desktop.in b/plugins/filebrowser/filebrowser.plugin.desktop.in
new file mode 100644
index 00000000..625f2d01
--- /dev/null
+++ b/plugins/filebrowser/filebrowser.plugin.desktop.in
@@ -0,0 +1,10 @@
+[Plugin]
+Loader=C
+Module=filebrowser
+IAge=2
+_Name=File Browser Pane
+_Description=Easy file access from the side pane
+Icon=system-file-manager
+Authors=Jesse van den Kieboom <jesse@icecrew.nl>
+Copyright=Copyright © 2006 Jesse van den Kieboom
+Website=http://www.mate-desktop.org
diff --git a/plugins/filebrowser/filebrowser.pluma-plugin.desktop.in b/plugins/filebrowser/filebrowser.pluma-plugin.desktop.in
deleted file mode 100644
index 02668983..00000000
--- a/plugins/filebrowser/filebrowser.pluma-plugin.desktop.in
+++ /dev/null
@@ -1,10 +0,0 @@
-[Pluma Plugin]
-Loader=C
-Module=filebrowser
-IAge=2
-_Name=File Browser Pane
-_Description=Easy file access from the side pane
-Icon=system-file-manager
-Authors=Jesse van den Kieboom <jesse@icecrew.nl>
-Copyright=Copyright © 2006 Jesse van den Kieboom
-Website=http://www.mate-desktop.org
-- 
cgit v1.2.1