aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-08-25 09:03:29 -0400
committerKen VanDine <ken.vandine@canonical.com>2011-08-25 09:03:29 -0400
commit6bacf14ef210f0ff8a2cc179f235d70906485698 (patch)
tree3d4b01e0562a1c44e396ce0a45004d618757728d /data
parent92cb2ff94b4efb98437639a7c37fa894efa03556 (diff)
parentce36ed0c35e58f0244a090250ab7f96b8e5915ac (diff)
downloadayatana-indicator-session-6bacf14ef210f0ff8a2cc179f235d70906485698.tar.gz
ayatana-indicator-session-6bacf14ef210f0ff8a2cc179f235d70906485698.tar.bz2
ayatana-indicator-session-6bacf14ef210f0ff8a2cc179f235d70906485698.zip
* New upstream release.
- User menu should still show even if there is only 1 user (LP: #831758) - Bluetooth item in menu not needed (LP: #825111) - Newly created users are not added to the menu until next login (LP: #552048) - Users list in shutdown menu is not updated on user deletion (LP: #557608) - should use gsettings rather than gconf (LP: #656323)
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am49
-rw-r--r--data/Makefile.in131
-rw-r--r--data/com.canonical.indicator.session.gschema.xml.in24
-rw-r--r--data/extra-sessions/Makefile.in13
-rw-r--r--data/icons/16x16/Makefile.in13
-rw-r--r--data/icons/16x16/actions/Makefile.in13
-rw-r--r--data/icons/16x16/status/Makefile.in13
-rw-r--r--data/icons/22x22/Makefile.in13
-rw-r--r--data/icons/22x22/actions/Makefile.in13
-rw-r--r--data/icons/22x22/status/Makefile.in13
-rw-r--r--data/icons/24x24/Makefile.in13
-rw-r--r--data/icons/24x24/actions/Makefile.in13
-rw-r--r--data/icons/24x24/status/Makefile.in13
-rw-r--r--data/icons/32x32/Makefile.in13
-rw-r--r--data/icons/32x32/actions/Makefile.in13
-rw-r--r--data/icons/32x32/status/Makefile.in13
-rw-r--r--data/icons/Makefile.in13
-rw-r--r--data/icons/scalable/Makefile.in13
-rw-r--r--data/icons/scalable/actions/Makefile.in13
-rw-r--r--data/icons/scalable/status/Makefile.in13
-rw-r--r--data/indicator-session-lock-screen.desktop.in.in9
-rw-r--r--data/indicator-session-logout.desktop.in.in9
-rw-r--r--data/indicator-session-restart.desktop.in.in9
-rw-r--r--data/indicator-session-shutdown.desktop.in.in9
-rw-r--r--data/indicator-session.convert5
-rw-r--r--data/indicator-session.schemas.in50
26 files changed, 292 insertions, 224 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 1f522d7..7e851a7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,37 +9,42 @@ dbus_services_DATA = $(service_in_files:.service.in=.service)
%.service: %.service.in
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
-##############################
-# GConf Schema
-##############################
+@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
-schemadir = \
- $(GCONF_SCHEMA_FILE_DIR)
+@GSETTINGS_RULES@
+gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
-schema_in_files = \
- indicator-session.schemas.in
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = indicator-session.convert
-schema_DATA = \
- $(schema_in_files:.schemas.in=.schemas)
+@INTLTOOL_DESKTOP_RULE@
-@INTLTOOL_SCHEMAS_RULE@
+%.desktop.in: %.desktop.in.in
+ sed \
+ -e "s|\@libexecdir\@|$(libexecdir)|" \
+ -e "s|\@bindir\@|$(bindir)|" \
+ $< > $@
+logout_helper_desktop_in_in_files = \
+ indicator-session-lock-screen.desktop.in.in \
+ indicator-session-logout.desktop.in.in \
+ indicator-session-restart.desktop.in.in \
+ indicator-session-shutdown.desktop.in.in
-#$(dbus_services_DATA): $(service_in_files) Makefile
-# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+logout_helperdir = $(datadir)/applications
+logout_helper_desktop_files = \
+ $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
+logout_helper_DATA = $(logout_helper_desktop_files)
EXTRA_DIST = \
$(service_in_files) \
- $(schema_in_files)
+ $(gsettings_SCHEMAS:.xml=.xml.in) \
+ $(logout_helper_desktop_in_in_files)
+
CLEANFILES = \
$(dbus_services_DATA) \
- $(schema_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
+ $(gsettings_SCHEMAS) \
+ $(logout_helper_desktop_files)
+
diff --git a/data/Makefile.in b/data/Makefile.in
index fa8909e..47ead23 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -35,9 +35,13 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
subdir = data
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+DIST_COMMON = $(dist_convert_DATA) $(srcdir)/Makefile.am \
+ $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -81,8 +85,9 @@ am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
am__installdirs = "$(DESTDIR)$(dbus_servicesdir)" \
- "$(DESTDIR)$(schemadir)"
-DATA = $(dbus_services_DATA) $(schema_DATA)
+ "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"
+DATA = $(dbus_services_DATA) $(dist_convert_DATA) \
+ $(logout_helper_DATA)
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -149,16 +154,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -247,6 +249,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
@@ -282,29 +285,29 @@ SUBDIRS = \
dbus_servicesdir = $(DBUSSERVICEDIR)
service_in_files = indicator-session.service.in
dbus_services_DATA = $(service_in_files:.service.in=.service)
-
-##############################
-# GConf Schema
-##############################
-schemadir = \
- $(GCONF_SCHEMA_FILE_DIR)
-
-schema_in_files = \
- indicator-session.schemas.in
-
-schema_DATA = \
- $(schema_in_files:.schemas.in=.schemas)
-
-
-#$(dbus_services_DATA): $(service_in_files) Makefile
-# sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml
+convertdir = $(datadir)/GConf/gsettings
+dist_convert_DATA = indicator-session.convert
+logout_helper_desktop_in_in_files = \
+ indicator-session-lock-screen.desktop.in.in \
+ indicator-session-logout.desktop.in.in \
+ indicator-session-restart.desktop.in.in \
+ indicator-session-shutdown.desktop.in.in
+
+logout_helperdir = $(datadir)/applications
+logout_helper_desktop_files = \
+ $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop)
+
+logout_helper_DATA = $(logout_helper_desktop_files)
EXTRA_DIST = \
$(service_in_files) \
- $(schema_in_files)
+ $(gsettings_SCHEMAS:.xml=.xml.in) \
+ $(logout_helper_desktop_in_in_files)
CLEANFILES = \
$(dbus_services_DATA) \
- $(schema_DATA)
+ $(gsettings_SCHEMAS) \
+ $(logout_helper_desktop_files)
all: all-recursive
@@ -365,26 +368,46 @@ uninstall-dbus_servicesDATA:
test -n "$$files" || exit 0; \
echo " ( cd '$(DESTDIR)$(dbus_servicesdir)' && rm -f" $$files ")"; \
cd "$(DESTDIR)$(dbus_servicesdir)" && rm -f $$files
-install-schemaDATA: $(schema_DATA)
+install-dist_convertDATA: $(dist_convert_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(convertdir)" || $(MKDIR_P) "$(DESTDIR)$(convertdir)"
+ @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
+ for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ echo "$$d$$p"; \
+ done | $(am__base_list) | \
+ while read files; do \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(convertdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(convertdir)" || exit $$?; \
+ done
+
+uninstall-dist_convertDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_convert_DATA)'; test -n "$(convertdir)" || list=; \
+ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+ test -n "$$files" || exit 0; \
+ echo " ( cd '$(DESTDIR)$(convertdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(convertdir)" && rm -f $$files
+install-logout_helperDATA: $(logout_helper_DATA)
@$(NORMAL_INSTALL)
- test -z "$(schemadir)" || $(MKDIR_P) "$(DESTDIR)$(schemadir)"
- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+ test -z "$(logout_helperdir)" || $(MKDIR_P) "$(DESTDIR)$(logout_helperdir)"
+ @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \
for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
echo "$$d$$p"; \
done | $(am__base_list) | \
while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(schemadir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(schemadir)" || exit $$?; \
+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(logout_helperdir)'"; \
+ $(INSTALL_DATA) $$files "$(DESTDIR)$(logout_helperdir)" || exit $$?; \
done
-uninstall-schemaDATA:
+uninstall-logout_helperDATA:
@$(NORMAL_UNINSTALL)
- @list='$(schema_DATA)'; test -n "$(schemadir)" || list=; \
+ @list='$(logout_helper_DATA)'; test -n "$(logout_helperdir)" || list=; \
files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(schemadir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(schemadir)" && rm -f $$files
+ echo " ( cd '$(DESTDIR)$(logout_helperdir)' && rm -f" $$files ")"; \
+ cd "$(DESTDIR)$(logout_helperdir)" && rm -f $$files
# This directory's subdirectories are mostly independent; you can cd
# into them and run `make' without going through this Makefile.
@@ -584,7 +607,7 @@ check: check-recursive
all-am: Makefile $(DATA)
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(schemadir)"; do \
+ for dir in "$(DESTDIR)$(dbus_servicesdir)" "$(DESTDIR)$(convertdir)" "$(DESTDIR)$(logout_helperdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
@@ -633,8 +656,8 @@ info: info-recursive
info-am:
-install-data-am: install-data-local install-dbus_servicesDATA \
- install-schemaDATA
+install-data-am: install-dbus_servicesDATA install-dist_convertDATA \
+ install-logout_helperDATA
install-dvi: install-dvi-recursive
@@ -678,7 +701,8 @@ ps: ps-recursive
ps-am:
-uninstall-am: uninstall-dbus_servicesDATA uninstall-schemaDATA
+uninstall-am: uninstall-dbus_servicesDATA uninstall-dist_convertDATA \
+ uninstall-logout_helperDATA
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
install-am install-strip tags-recursive
@@ -688,27 +712,34 @@ uninstall-am: uninstall-dbus_servicesDATA uninstall-schemaDATA
ctags ctags-recursive distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am html \
html-am info info-am install install-am install-data \
- install-data-am install-data-local install-dbus_servicesDATA \
- install-dvi install-dvi-am install-exec install-exec-am \
- install-html install-html-am install-info install-info-am \
+ install-data-am install-dbus_servicesDATA \
+ install-dist_convertDATA install-dvi install-dvi-am \
+ install-exec install-exec-am install-html install-html-am \
+ install-info install-info-am install-logout_helperDATA \
install-man install-pdf install-pdf-am install-ps \
- install-ps-am install-schemaDATA install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
uninstall uninstall-am uninstall-dbus_servicesDATA \
- uninstall-schemaDATA
+ uninstall-dist_convertDATA uninstall-logout_helperDATA
%.service: %.service.in
sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
@INTLTOOL_SCHEMAS_RULE@
+@INTLTOOL_XML_NOMERGE_RULE@
+
+@GSETTINGS_RULES@
+
+@INTLTOOL_DESKTOP_RULE@
-@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
-@GCONF_SCHEMAS_INSTALL_TRUE@ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-@GCONF_SCHEMAS_INSTALL_TRUE@ gconftool-2 --makefile-install-rule $(schema_DATA)
-@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
+%.desktop.in: %.desktop.in.in
+ sed \
+ -e "s|\@libexecdir\@|$(libexecdir)|" \
+ -e "s|\@bindir\@|$(bindir)|" \
+ $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/data/com.canonical.indicator.session.gschema.xml.in b/data/com.canonical.indicator.session.gschema.xml.in
new file mode 100644
index 0000000..d1d7d4c
--- /dev/null
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -0,0 +1,24 @@
+<schemalist>
+ <schema id="com.canonical.indicator.session" path="/apps/indicator-session/">
+ <key name="suppress-logout-restart-shutdown" type="b">
+ <default>false</default>
+ <_summary>Suppress the dialog to confirm logout, restart and shutdown action</_summary>
+ <_description>Whether or not to show confirmation dialogs for logout, restart and shutdown actions.</_description>
+ </key>
+ <key name="suppress-logout-menuitem" type="b">
+ <default>false</default>
+ <_summary>Remove the Log Out item from the session menu</_summary>
+ <_description>Makes it so that the logout button doesn’t show in the session menu.</_description>
+ </key>
+ <key name="suppress-restart-menuitem" type="b">
+ <default>false</default>
+ <_summary>Remove the Restart item from the session menu</_summary>
+ <_description>Makes it so that the restart button doesn’t show in the session menu.</_description>
+ </key>
+ <key name="suppress-shutdown-menuitem" type="b">
+ <default>false</default>
+ <_summary>Remove the shutdown item from the session menu</_summary>
+ <_description>Makes it so that the shutdown button doesn’t show in the session menu.</_description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/extra-sessions/Makefile.in b/data/extra-sessions/Makefile.in
index e63598e..9854ac1 100644
--- a/data/extra-sessions/Makefile.in
+++ b/data/extra-sessions/Makefile.in
@@ -41,7 +41,10 @@ host_triplet = @host@
subdir = data/extra-sessions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -112,16 +115,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -210,6 +210,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/16x16/Makefile.in b/data/icons/16x16/Makefile.in
index 884d3b1..94c4663 100644
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -36,7 +36,10 @@ host_triplet = @host@
subdir = data/icons/16x16
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -124,16 +127,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -222,6 +222,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/16x16/actions/Makefile.in b/data/icons/16x16/actions/Makefile.in
index f47bbe5..e9397e6 100644
--- a/data/icons/16x16/actions/Makefile.in
+++ b/data/icons/16x16/actions/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/16x16/actions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/16x16/status/Makefile.in b/data/icons/16x16/status/Makefile.in
index 2f49987..8817356 100644
--- a/data/icons/16x16/status/Makefile.in
+++ b/data/icons/16x16/status/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/16x16/status
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/22x22/Makefile.in b/data/icons/22x22/Makefile.in
index e3595c1..6874e54 100644
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -36,7 +36,10 @@ host_triplet = @host@
subdir = data/icons/22x22
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -124,16 +127,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -222,6 +222,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/22x22/actions/Makefile.in b/data/icons/22x22/actions/Makefile.in
index 9d0ffb3..6c83d3c 100644
--- a/data/icons/22x22/actions/Makefile.in
+++ b/data/icons/22x22/actions/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/22x22/actions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/22x22/status/Makefile.in b/data/icons/22x22/status/Makefile.in
index 7047bc6..cd06560 100644
--- a/data/icons/22x22/status/Makefile.in
+++ b/data/icons/22x22/status/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/22x22/status
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/24x24/Makefile.in b/data/icons/24x24/Makefile.in
index f9c761e..6ecc099 100644
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
@@ -36,7 +36,10 @@ host_triplet = @host@
subdir = data/icons/24x24
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -124,16 +127,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -222,6 +222,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/24x24/actions/Makefile.in b/data/icons/24x24/actions/Makefile.in
index b8ea819..b756762 100644
--- a/data/icons/24x24/actions/Makefile.in
+++ b/data/icons/24x24/actions/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/24x24/actions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/24x24/status/Makefile.in b/data/icons/24x24/status/Makefile.in
index 7909cc5..e0f6c93 100644
--- a/data/icons/24x24/status/Makefile.in
+++ b/data/icons/24x24/status/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/24x24/status
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/32x32/Makefile.in b/data/icons/32x32/Makefile.in
index 4a883dd..4a0235b 100644
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
@@ -36,7 +36,10 @@ host_triplet = @host@
subdir = data/icons/32x32
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -124,16 +127,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -222,6 +222,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/32x32/actions/Makefile.in b/data/icons/32x32/actions/Makefile.in
index 6564192..364e847 100644
--- a/data/icons/32x32/actions/Makefile.in
+++ b/data/icons/32x32/actions/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/32x32/actions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/32x32/status/Makefile.in b/data/icons/32x32/status/Makefile.in
index a9e54a5..4502aa3 100644
--- a/data/icons/32x32/status/Makefile.in
+++ b/data/icons/32x32/status/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/32x32/status
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in
index cc00b90..b6073d4 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -36,7 +36,10 @@ host_triplet = @host@
subdir = data/icons
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -124,16 +127,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -222,6 +222,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/scalable/Makefile.in b/data/icons/scalable/Makefile.in
index 1cc0667..b3bad26 100644
--- a/data/icons/scalable/Makefile.in
+++ b/data/icons/scalable/Makefile.in
@@ -36,7 +36,10 @@ host_triplet = @host@
subdir = data/icons/scalable
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -124,16 +127,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -222,6 +222,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/scalable/actions/Makefile.in b/data/icons/scalable/actions/Makefile.in
index 089adce..7ea57ac 100644
--- a/data/icons/scalable/actions/Makefile.in
+++ b/data/icons/scalable/actions/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/scalable/actions
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/icons/scalable/status/Makefile.in b/data/icons/scalable/status/Makefile.in
index c2090a9..be8c18d 100644
--- a/data/icons/scalable/status/Makefile.in
+++ b/data/icons/scalable/status/Makefile.in
@@ -37,7 +37,10 @@ host_triplet = @host@
subdir = data/icons/scalable/status
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
+ $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+ $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+ $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -108,16 +111,13 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
-GCONFTOOL = @GCONFTOOL@
-GCONF_CFLAGS = @GCONF_CFLAGS@
-GCONF_LIBS = @GCONF_LIBS@
-GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@
-GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_COMPILE_SCHEMAS = @GLIB_COMPILE_SCHEMAS@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GNOMELOCALEDIR = @GNOMELOCALEDIR@
GREP = @GREP@
+GSETTINGS_DISABLE_SCHEMAS_COMPILE = @GSETTINGS_DISABLE_SCHEMAS_COMPILE@
GTKLOGOUTHELPER_CFLAGS = @GTKLOGOUTHELPER_CFLAGS@
GTKLOGOUTHELPER_LIBS = @GTKLOGOUTHELPER_LIBS@
INDICATORDIR = @INDICATORDIR@
@@ -206,6 +206,7 @@ datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
diff --git a/data/indicator-session-lock-screen.desktop.in.in b/data/indicator-session-lock-screen.desktop.in.in
new file mode 100644
index 0000000..e44cd9f
--- /dev/null
+++ b/data/indicator-session-lock-screen.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Lock Screen
+TryExec=@bindir@/xdg-screensaver
+Exec=@bindir@/xdg-screensaver lock
+Icon=system-lock-screen
+Terminal=false
+Type=Application
+OnlyShowIn=Unity;
+Version=1.0
diff --git a/data/indicator-session-logout.desktop.in.in b/data/indicator-session-logout.desktop.in.in
new file mode 100644
index 0000000..46ba087
--- /dev/null
+++ b/data/indicator-session-logout.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Log Out
+TryExec=@libexecdir@/gtk-logout-helper
+Exec=@libexecdir@/gtk-logout-helper --logout
+Icon=system-log-out
+Terminal=false
+Type=Application
+OnlyShowIn=Unity;
+Version=1.0
diff --git a/data/indicator-session-restart.desktop.in.in b/data/indicator-session-restart.desktop.in.in
new file mode 100644
index 0000000..67aa390
--- /dev/null
+++ b/data/indicator-session-restart.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Restart
+TryExec=@libexecdir@/gtk-logout-helper
+Exec=@libexecdir@/gtk-logout-helper --restart
+Icon=system-restart
+Terminal=false
+Type=Application
+OnlyShowIn=Unity;
+Version=1.0
diff --git a/data/indicator-session-shutdown.desktop.in.in b/data/indicator-session-shutdown.desktop.in.in
new file mode 100644
index 0000000..4bd51fe
--- /dev/null
+++ b/data/indicator-session-shutdown.desktop.in.in
@@ -0,0 +1,9 @@
+[Desktop Entry]
+_Name=Shut Down
+TryExec=@libexecdir@/gtk-logout-helper
+Exec=@libexecdir@/gtk-logout-helper --shutdown
+Icon=system-shutdown
+Terminal=false
+Type=Application
+OnlyShowIn=Unity;
+Version=1.0
diff --git a/data/indicator-session.convert b/data/indicator-session.convert
new file mode 100644
index 0000000..3a087a6
--- /dev/null
+++ b/data/indicator-session.convert
@@ -0,0 +1,5 @@
+[com.canonical.indicator.session]
+suppress_logout_restart_shutdown = /apps/indicator-session/suppress_logout_restart_shutdown
+suppress_logout_menuitem = /apps/indicator-session/suppress_logout_menuitem
+suppress_restart_menuitem = /apps/indicator-session/suppress_restart_menuitem
+suppress_shutdown_menuitem = /apps/indicator-session/suppress_shutdown_menuitem
diff --git a/data/indicator-session.schemas.in b/data/indicator-session.schemas.in
deleted file mode 100644
index f4e70da..0000000
--- a/data/indicator-session.schemas.in
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>
- <schema>
- <key>/schemas/apps/indicator-session/suppress_logout_menuitem</key>
- <applyto>/apps/indicator-session/suppress_logout_menuitem</applyto>
- <owner>indicator-session</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Remove the Log Out item from the session menu</short>
- <long>Makes it so that the logout button doesn't show in the session menu.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/indicator-session/suppress_restart_menuitem</key>
- <applyto>/apps/indicator-session/suppress_restart_menuitem</applyto>
- <owner>indicator-session</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Remove the Restart item from the session menu</short>
- <long>Makes it so that the restart button doesn't show in the session menu.</long>
- </locale>
- </schema>
- <schema>
- <key>/schemas/apps/indicator-session/suppress_shutdown_menuitem</key>
- <applyto>/apps/indicator-session/suppress_shutdown_menuitem</applyto>
- <owner>indicator-session</owner>
- <type>bool</type>
- <default>FALSE</default>
- <locale name="C">
- <short>Remove the shutdown item from the session menu</short>
- <long>Makes it so that the shutdown button doesn't show in the session menu.</long>
- </locale>
- </schema>
- </schemalist>
-</gconfschemafile>