aboutsummaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorChristoph Korn <korn@ubuntu>2009-09-02 16:17:44 +0200
committerChristoph Korn <korn@ubuntu>2009-09-02 16:17:44 +0200
commit1f0874253406566587d4e42a9ee2f4617a5c66d9 (patch)
treecd8a07328b4a7fcdf836e6596c311a0640e2cf2d /data/Makefile.am
parent41f1b3206ab13b008aed6670dc42636049c9590d (diff)
downloadayatana-indicator-session-1f0874253406566587d4e42a9ee2f4617a5c66d9.tar.gz
ayatana-indicator-session-1f0874253406566587d4e42a9ee2f4617a5c66d9.tar.bz2
ayatana-indicator-session-1f0874253406566587d4e42a9ee2f4617a5c66d9.zip
These patches introduce a gconf key whether the logout/restart/shutdown confirmations
should be shown or not. Also the menu items should be suffixed by '...' accordingly. However this only works after a restart. Bugs which get fixed are: https://bugs.launchpad.net/indicator-session/+bug/422025 https://bugs.launchpad.net/ubuntu/+source/indicator-session/+bug/421693 https://bugs.launchpad.net/ubuntu/+source/indicator-session/+bug/419472
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am32
1 files changed, 30 insertions, 2 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 434e7d6..9ba0d97 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,9 +9,37 @@ dbus_services_DATA = $(service_in_files:.service.in=.service)
%.service: %.service.in
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+##############################
+# GConf Schema
+##############################
+
+schemadir = \
+ $(GCONF_SCHEMA_FILE_DIR)
+
+schema_in_files = \
+ indicator-session.schemas.in
+
+schema_DATA = \
+ $(schema_in_files:.schemas.in=.schemas)
+
+@INTLTOOL_SCHEMAS_RULE@
+
+
#$(dbus_services_DATA): $(service_in_files) Makefile
# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-EXTRA_DIST = $(service_in_files)
+EXTRA_DIST = \
+ $(service_in_files) \
+ $(schema_in_files)
+
+CLEANFILES = \
+ $(dbus_services_DATA) \
+ $(schema_DATA)
-CLEANFILES = $(dbus_services_DATA)
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
+ gconftool-2 --makefile-install-rule $(schema_DATA)
+else
+install-data-local:
+endif