[gnome-settings-daemon/wip/ibus: 3/4] Fix installation of the ibus plugin



commit 5cca084b981d6ec9a278b3a4962a172976643512
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Nov 16 20:32:05 2011 -0500

    Fix installation of the ibus plugin

 data/Makefile.am                           |    6 ++++++
 plugins/ibus/Makefile.am                   |    5 -----
 plugins/ibus/ibus.gnome-settings-plugin.in |   10 +++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 43ba27c..0d88866 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -27,6 +27,12 @@ else
 all_schemas += org.gnome.settings-daemon.plugins.updates.gschema.xml
 endif
 
+if HAVE_IBUS
+gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.ibus.gschema.xml
+else
+all_schemas += org.gnome.settings-daemon.plugins.ibus.gschema.xml
+endif
+
 if HAVE_GUDEV
 gsettings_SCHEMAS += org.gnome.settings-daemon.plugins.orientation.gschema.xml
 else
diff --git a/plugins/ibus/Makefile.am b/plugins/ibus/Makefile.am
index cc5f102..92b3292 100644
--- a/plugins/ibus/Makefile.am
+++ b/plugins/ibus/Makefile.am
@@ -42,8 +42,3 @@ DISTCLEANFILES =		\
 	$(plugin_DATA)
 
 @GSD_INTLTOOL_PLUGIN_RULE@
-
-# override to _not_ install the test plugin
-# do not copy into your plugin
-install-pluginDATA:
-install-pluginLTLIBRARIES:
diff --git a/plugins/ibus/ibus.gnome-settings-plugin.in b/plugins/ibus/ibus.gnome-settings-plugin.in
index 3632a8c..12570f9 100644
--- a/plugins/ibus/ibus.gnome-settings-plugin.in
+++ b/plugins/ibus/ibus.gnome-settings-plugin.in
@@ -1,8 +1,8 @@
 [GNOME Settings Plugin]
-Module=dummy
+Module=ibus
 IAge=0
-_Name=Dummy
-_Description=Dummy plugin
-Authors=AUTHOR
-Copyright=Copyright  2007 AUTHOR
+_Name=IBus
+_Description=IBus plugin
+Authors=Matthias Clasen
+Copyright=Copyright  2011 Red Hat, Inc
 Website=



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]