diff options
| author | Ted Gould <ted@canonical.com> | 2009-09-08 10:14:27 -0500 |
|---|---|---|
| committer | Ted Gould <ted@canonical.com> | 2009-09-08 10:14:27 -0500 |
| commit | 74caa096a9fac06420704d9f8db08c7864d805a0 (patch) | |
| tree | f85d783106eb8b1f28d81ec89f67ad4e14b865a2 /data | |
| parent | 44ecddced2e977719ac661a8ed06969d1df0400b (diff) | |
| parent | 85799abbe897e0f1e08b8d594716ab34b543d9fd (diff) | |
| download | ayatana-indicator-session-74caa096a9fac06420704d9f8db08c7864d805a0.tar.gz ayatana-indicator-session-74caa096a9fac06420704d9f8db08c7864d805a0.tar.bz2 ayatana-indicator-session-74caa096a9fac06420704d9f8db08c7864d805a0.zip | |
Merging in c_korn's branch.
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 32 | ||||
| -rw-r--r-- | data/indicator-session.schemas.in | 17 |
2 files changed, 47 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 diff --git a/data/indicator-session.schemas.in b/data/indicator-session.schemas.in new file mode 100644 index 0000000..1db9226 --- /dev/null +++ b/data/indicator-session.schemas.in @@ -0,0 +1,17 @@ +<?xml version="1.0"?> +<gconfschemafile> + <schemalist> + <schema> + <key>/schemas/apps/indicator-session/suppress_logout_restart_shutdown</key> + <applyto>/apps/indicator-session/suppress_logout_restart_shutdown</applyto> + <owner>indicator-session</owner> + <type>bool</type> + <default>FALSE</default> + <locale name="C"> + <short>Suppress the dialog to confirm logout, restart and shutdown action</short> + <long>Whether or not to show confirmation dialogs for logout, + restart and shutdown actions.</long> + </locale> + </schema> + </schemalist> +</gconfschemafile> |