Update to Ubuntu Desktop

43 files changed, 1210 insertions, 650 deletions

diff --git a/AUTHORS b/AUTHORS
index 2800da5..f3226fb 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -7,6 +7,7 @@
  Daniel van Vugt 
  David Barth 
  Gabor Kelemen 
+ Jeremy Bicha 
  Ken VanDine 
  Kyle Nitzsche 
  Luke Yelavich 
diff --git a/ChangeLog b/ChangeLog
index 20b9ed6..2d038ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,293 @@
 # Generated by Makefile. Do not edit.
 
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	ted's str allocation fixes
+
+2011-08-25  Ted Gould  <ted@gould.cx>
+
+	Change the function to assume nothing about the parameters and always allocate a string
+
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	bump for next release
+
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	fixes for the min users and label on panel for guest
+
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	fix the min users bug plus guest label utf8 issue
+
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	protection against dodgy vendor ids provided by udev
+
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	bumped the dbusmenu version depends
+
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	updated po files and bumped for beta release
+
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	branded attached devices menuitem labels
+
+2011-08-25  Conor Curran  <conor.curran@canonical.com>
+
+	fixed the translations
+
+2011-08-23  Conor Curran  <conor.curran@canonical.com>
+
+	set the alert state on the apt item when reboot is required
+
+2011-08-23  Conor Curran  <conor.curran@canonical.com>
+
+	user menu now shown if guest session is possible also guest name has been set on the panel
+
+2011-08-23  Conor Curran  <conor.curran@canonical.com>
+
+	removed bluetooth item and labels on webcams and scanners are now manufacturer specific
+
+2011-08-24  Conor Curran  <conor.curran@canonical.com>
+
+	merged teds string fixes and tests
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Ignoring the test scripts
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Fixing those ASCII quotes
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Adding a test to look for various ASCII quotes
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Fix the message
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Add a test to test the space before an ellipsis at the end of a string
+
+2011-08-24  Conor Curran  <conor.curran@canonical.com>
+
+	merge the fixes for gtk2
+
+2011-08-24  Conor Curran  <conor.curran@canonical.com>
+
+	fix the dot alignment in the gtk2s user widget
+
+2011-08-24  Conor Curran  <conor.curran@canonical.com>
+
+	fix that broken trunk
+
+2011-08-24  Conor Curran  <conor.curran@canonical.com>
+
+	gtk2 user widget drawing fixed
+
+2011-08-24  Conor Curran  <conor.curran@canonical.com>
+
+	merged the desktop session files branch
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Adding the bin directory as well
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Making the desktop files actually install
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Adding a lock screen desktop file as well
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Fixing the TryExecs and the versions
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Adding logout and restart desktop files as well
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Adding a desktop file for shutting down
+
+2011-08-23  Ted Gould  <ted@gould.cx>
+
+	Activate prototype
+
+2011-08-23  Conor Curran  <conor.curran@canonical.com>
+
+	merged user, gsettings and other stuff
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	uncomment signal subscription that doesn't work
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	changed around the sync users so as it can be used to refresh the user list on any given event
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	merged the dynamic users work
+
+2011-08-19  Conor Curran  <conor.curran@canonical.com>
+
+	remove the debugs
+
+2011-08-19  Conor Curran  <conor.curran@canonical.com>
+
+	users now dynamically responsive to addition and deletion of users
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	don't draw border on default icon
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	tidy up
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	user icon border now being drawn and gtk2 dot also taken care of
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	user images now being loaded into the user menu
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	used the set aside defines for icon names
+
+2011-08-22  Ted Gould  <ted@gould.cx>
+
+	Add a user accounts item on the user menu
+
+2011-08-21  Jeremy Bicha  <jbicha@ubuntu.com>
+
+	Add User Accounts link to bottom of user menu
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	ellipsis fixes
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Ignoring the test-ellipsis script
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Fix all the ellipsis
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Ensuring a pass is a pass
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Making a bit more generic by using GETTEXT_PACKAGE
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Making a check to see if there is ellipsis in the user visible strings
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	gsettings port
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Using the right schema
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Fixing key names
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Don't have that yet
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Ignoring GSettings generated files and the pot file
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Adding GSettings Rule
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Setting up convert script and completing the GSettings transition including translations
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Adding GSettings schema and updating C files
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Changing to using the GSettings signals for change
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Changing name of ensure function
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Removing the 'gconf' string
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Fixing the comment
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Setting the notifications to use the g_settings changed signals
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Change name to settings helper
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	ignore generated file
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Porting the keys for the device and user manager over to use gsettings
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Comment out notifications so that we can get this compiling again.
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Dropping gconf from build
+
+2011-08-19  Ted Gould  <ted@gould.cx>
+
+	Fix getting of all the keys to be settings functions
+
+2011-08-19  Conor Curran  <conor.curran@canonical.com>
+
+	the beginnings of using gsettings in the gconf helper
+
+2011-08-19  Conor Curran  <conor.curran@canonical.com>
+
+	converted the old gconf schema to gsettings
+
+2011-08-22  Conor Curran  <conor.curran@canonical.com>
+
+	bumped for release
+
 2011-08-18  Conor Curran  <conor.curran@canonical.com>
 
 	Ellipses fixes
diff --git a/Makefile.am b/Makefile.am
index 5850769..d63dac8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,8 +35,13 @@ dist-hook:
 	fi
 
 TESTS = \
-	test-ellipsis
+	test-ellipsis \
+	test-space-ellipsis \
+	test-ascii-quotes
 
+#####
+# Tests for there being proper ellipsis instead of three periods in a row
+#####
 test-ellipsis: po
 	@echo "#!/bin/bash" > $@
 	@echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
@@ -44,4 +49,26 @@ test-ellipsis: po
 	@echo "exit 0" >> $@
 	@chmod +x $@
 
+#####
+# Tests for there being a space before an ellipsis
+#####
+test-space-ellipsis: po
+	@echo "#!/bin/bash" > $@
+	@echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
+	@echo "grep -c -e \"^msgid.* …\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Space before ellipsis found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "exit 0" >> $@
+	@chmod +x $@
+
+#####
+# Tests for ASCII quote types
+#####
+test-ascii-quotes: po
+	@echo "#!/bin/bash" > $@
+	@echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
+	@echo "grep -c -e \"^msgid \\\".*'.*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII apostrophy found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "grep -c -e \"^msgid \\\".*\\\".*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII quote found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "grep -c -e \"^msgid \\\".*\\\`.*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII backtick found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "exit 0" >> $@
+	@chmod +x $@
+
 CLEANFILES = $(TESTS)
diff --git a/Makefile.in b/Makefile.in
index fdd2d78..1013804 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,6 +71,8 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
 	distdir dist dist-all distcheck
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -140,16 +142,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@
@@ -238,6 +237,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -273,6 +273,12 @@ SUBDIRS = \
 
 EXTRA_DIST = autogen.sh
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
+TESTS = \
+	test-ellipsis \
+	test-space-ellipsis \
+	test-ascii-quotes
+
+CLEANFILES = $(TESTS)
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -473,6 +479,98 @@ GTAGS:
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 
+check-TESTS: $(TESTS)
+	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
+	srcdir=$(srcdir); export srcdir; \
+	list=' $(TESTS) '; \
+	$(am__tty_colors); \
+	if test -n "$$list"; then \
+	  for tst in $$list; do \
+	    if test -f ./$$tst; then dir=./; \
+	    elif test -f $$tst; then dir=; \
+	    else dir="$(srcdir)/"; fi; \
+	    if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xpass=`expr $$xpass + 1`; \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=XPASS; \
+	      ;; \
+	      *) \
+		col=$$grn; res=PASS; \
+	      ;; \
+	      esac; \
+	    elif test $$? -ne 77; then \
+	      all=`expr $$all + 1`; \
+	      case " $(XFAIL_TESTS) " in \
+	      *[\ \	]$$tst[\ \	]*) \
+		xfail=`expr $$xfail + 1`; \
+		col=$$lgn; res=XFAIL; \
+	      ;; \
+	      *) \
+		failed=`expr $$failed + 1`; \
+		col=$$red; res=FAIL; \
+	      ;; \
+	      esac; \
+	    else \
+	      skip=`expr $$skip + 1`; \
+	      col=$$blu; res=SKIP; \
+	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
+	  done; \
+	  if test "$$all" -eq 1; then \
+	    tests="test"; \
+	    All=""; \
+	  else \
+	    tests="tests"; \
+	    All="All "; \
+	  fi; \
+	  if test "$$failed" -eq 0; then \
+	    if test "$$xfail" -eq 0; then \
+	      banner="$$All$$all $$tests passed"; \
+	    else \
+	      if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \
+	      banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \
+	    fi; \
+	  else \
+	    if test "$$xpass" -eq 0; then \
+	      banner="$$failed of $$all $$tests failed"; \
+	    else \
+	      if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \
+	      banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \
+	    fi; \
+	  fi; \
+	  dashes="$$banner"; \
+	  skipped=""; \
+	  if test "$$skip" -ne 0; then \
+	    if test "$$skip" -eq 1; then \
+	      skipped="($$skip test was not run)"; \
+	    else \
+	      skipped="($$skip tests were not run)"; \
+	    fi; \
+	    test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$skipped"; \
+	  fi; \
+	  report=""; \
+	  if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \
+	    report="Please report to $(PACKAGE_BUGREPORT)"; \
+	    test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \
+	      dashes="$$report"; \
+	  fi; \
+	  dashes=`echo "$$dashes" | sed s/./=/g`; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
+	  echo "$$banner"; \
+	  test -z "$$skipped" || echo "$$skipped"; \
+	  test -z "$$report" || echo "$$report"; \
+	  echo "$$dashes$$std"; \
+	  test "$$failed" -eq 0; \
+	else :; fi
+
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
@@ -652,6 +750,7 @@ distcleancheck: distclean
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
+	$(MAKE) $(AM_MAKEFLAGS) check-TESTS
 check: check-recursive
 all-am: Makefile config.h
 installdirs: installdirs-recursive
@@ -673,6 +772,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -751,24 +851,25 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all check-am \
 	ctags-recursive install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
-	all all-am am--refresh check check-am clean clean-generic \
-	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-dvi \
-	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps 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
+	all all-am am--refresh check check-TESTS check-am clean \
+	clean-generic clean-libtool ctags ctags-recursive dist \
+	dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \
+	dist-tarZ dist-xz dist-zip distcheck distclean \
+	distclean-generic distclean-hdr distclean-libtool \
+	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps 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
 
 
 dist-hook:
@@ -797,6 +898,38 @@ dist-hook:
 			echo Failed to generate AUTHORS: not a branch >&2; \
 	fi
 
+#####
+# Tests for there being proper ellipsis instead of three periods in a row
+#####
+test-ellipsis: po
+	@echo "#!/bin/bash" > $@
+	@echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
+	@echo "grep -c -e \"^msgid.*\.\.\.\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Ellipsis found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "exit 0" >> $@
+	@chmod +x $@
+
+#####
+# Tests for there being a space before an ellipsis
+#####
+test-space-ellipsis: po
+	@echo "#!/bin/bash" > $@
+	@echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
+	@echo "grep -c -e \"^msgid.* …\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"Space before ellipsis found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "exit 0" >> $@
+	@chmod +x $@
+
+#####
+# Tests for ASCII quote types
+#####
+test-ascii-quotes: po
+	@echo "#!/bin/bash" > $@
+	@echo "(cd po && make $(GETTEXT_PACKAGE).pot)" >> $@
+	@echo "grep -c -e \"^msgid \\\".*'.*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII apostrophy found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "grep -c -e \"^msgid \\\".*\\\".*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII quote found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "grep -c -e \"^msgid \\\".*\\\`.*\\\"\" po/$(GETTEXT_PACKAGE).pot > /dev/null && echo \"ASCII backtick found in user visible strings\" >&2 && exit 1" >> $@
+	@echo "exit 0" >> $@
+	@chmod +x $@
+
 # 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.
 .NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
index 06519f3..655f0da 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -19,51 +19,6 @@ You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-dnl AM_GCONF_SOURCE_2
-dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
-dnl  (i.e. pass to gconftool-2
-dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where
-dnl  you should install foo.schemas files
-dnl
-
-AC_DEFUN([AM_GCONF_SOURCE_2],
-[
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-  AC_ARG_WITH([gconf-source],
-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-			     [Config database for installing schema files.]),
-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  AC_ARG_WITH([gconf-schema-file-dir],
-	      AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-			     [Directory for installing schema files.]),
-	      [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_FILE_DIR)
-  AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-
-  AC_ARG_ENABLE(schemas-install,
-  	AC_HELP_STRING([--disable-schemas-install],
-		       [Disable the schemas installation]),
-     [case ${enableval} in
-       yes|no) ;;
-       *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;;
-      esac])
-  AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no])
-])
-
 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
 #
@@ -497,6 +452,90 @@ sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
 fi])
 
 
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
+
+AC_DEFUN([GLIB_GSETTINGS],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE(schemas-compile,
+                AS_HELP_STRING([--disable-schemas-compile],
+                               [Disable regeneration of gschemas.compiled on install]),
+                [case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+                 esac])
+  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+  PKG_PROG_PKG_CONFIG([0.16])
+  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+  fi
+  AC_SUBST(GLIB_COMPILE_SCHEMAS)
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+  else
+    ifelse([$1],,[:],[$1])
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+  _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
+
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)
+
 
 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
 # serial 40 IT_PROG_INTLTOOL
diff --git a/configure b/configure
index f38da97..9bc0aba 100755
--- a/configure
+++ b/configure
@@ -629,13 +629,6 @@ GETTEXT_PACKAGE
 DBUSSERVICEDIR
 INDICATORICONSDIR
 INDICATORDIR
-GCONF_LIBS
-GCONF_CFLAGS
-GCONF_SCHEMAS_INSTALL_FALSE
-GCONF_SCHEMAS_INSTALL_TRUE
-GCONF_SCHEMA_FILE_DIR
-GCONF_SCHEMA_CONFIG_SOURCE
-GCONFTOOL
 GTKLOGOUTHELPER_LIBS
 GTKLOGOUTHELPER_CFLAGS
 SESSIONERVICE_LIBS
@@ -644,9 +637,6 @@ SESSIONSERVICE_LIBS
 SESSIONSERVICE_CFLAGS
 APPLET_LIBS
 APPLET_CFLAGS
-PKG_CONFIG_LIBDIR
-PKG_CONFIG_PATH
-PKG_CONFIG
 AM_BACKSLASH
 AM_DEFAULT_VERBOSITY
 OTOOL64
@@ -725,6 +715,13 @@ INTLTOOL_EXTRACT
 INTLTOOL_MERGE
 INTLTOOL_UPDATE
 USE_NLS
+GSETTINGS_RULES
+GLIB_COMPILE_SCHEMAS
+gsettingsschemadir
+PKG_CONFIG_LIBDIR
+PKG_CONFIG_PATH
+PKG_CONFIG
+GSETTINGS_DISABLE_SCHEMAS_COMPILE
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -793,6 +790,7 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 enable_maintainer_mode
+enable_schemas_compile
 enable_nls
 enable_dependency_tracking
 enable_shared
@@ -804,31 +802,26 @@ with_sysroot
 enable_libtool_lock
 enable_silent_rules
 with_gtk
-with_gconf_source
-with_gconf_schema_file_dir
-enable_schemas_install
 enable_localinstall
 '
       ac_precious_vars='build_alias
 host_alias
 target_alias
+PKG_CONFIG
+PKG_CONFIG_PATH
+PKG_CONFIG_LIBDIR
 CC
 CFLAGS
 LDFLAGS
 LIBS
 CPPFLAGS
 CPP
-PKG_CONFIG
-PKG_CONFIG_PATH
-PKG_CONFIG_LIBDIR
 APPLET_CFLAGS
 APPLET_LIBS
 SESSIONSERVICE_CFLAGS
 SESSIONSERVICE_LIBS
 GTKLOGOUTHELPER_CFLAGS
-GTKLOGOUTHELPER_LIBS
-GCONF_CFLAGS
-GCONF_LIBS'
+GTKLOGOUTHELPER_LIBS'
 
 
 # Initialize some variables set by options.
@@ -1449,6 +1442,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --enable-maintainer-mode  enable make rules and dependencies not useful
 			  (and sometimes confusing) to the casual installer
+  --disable-schemas-compile
+                          Disable regeneration of gschemas.compiled on install
   --disable-nls           do not use Native Language Support
   --disable-dependency-tracking  speeds up one-time build
   --enable-dependency-tracking   do not reject slow dependency extractors
@@ -1459,8 +1454,6 @@ Optional Features:
   --disable-libtool-lock  avoid locking (might break parallel builds)
   --enable-silent-rules          less verbose build output (undo: `make V=1')
   --disable-silent-rules         verbose build output (undo: `make V=0')
-  --disable-schemas-install
-                          Disable the schemas installation
   --enable-localinstall   install all of the files localy instead of system
                           directories (for distcheck)
 
@@ -1474,12 +1467,13 @@ Optional Packages:
                         (or the compiler's sysroot if not specified).
   --with-gtk              Which version of gtk to use for the indicator
                           [default=3]
-  --with-gconf-source=sourceaddress
-                          Config database for installing schema files.
-  --with-gconf-schema-file-dir=dir
-                          Directory for installing schema files.
 
 Some influential environment variables:
+  PKG_CONFIG  path to pkg-config utility
+  PKG_CONFIG_PATH
+              directories to add to pkg-config's search path
+  PKG_CONFIG_LIBDIR
+              path overriding pkg-config's built-in search path
   CC          C compiler command
   CFLAGS      C compiler flags
   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -1488,11 +1482,6 @@ Some influential environment variables:
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
   CPP         C preprocessor
-  PKG_CONFIG  path to pkg-config utility
-  PKG_CONFIG_PATH
-              directories to add to pkg-config's search path
-  PKG_CONFIG_LIBDIR
-              path overriding pkg-config's built-in search path
   APPLET_CFLAGS
               C compiler flags for APPLET, overriding pkg-config
   APPLET_LIBS linker flags for APPLET, overriding pkg-config
@@ -1504,9 +1493,6 @@ Some influential environment variables:
               C compiler flags for GTKLOGOUTHELPER, overriding pkg-config
   GTKLOGOUTHELPER_LIBS
               linker flags for GTKLOGOUTHELPER, overriding pkg-config
-  GCONF_CFLAGS
-              C compiler flags for GCONF, overriding pkg-config
-  GCONF_LIBS  linker flags for GCONF, overriding pkg-config
 
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
@@ -2759,7 +2745,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE=indicator-session
- VERSION=0.3.2
+ VERSION=0.3.3.2
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2825,6 +2811,239 @@ fi
 
 
 
+
+  # Check whether --enable-schemas-compile was given.
+if test "${enable_schemas_compile+set}" = set; then :
+  enableval=$enable_schemas_compile; case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) as_fn_error $? "bad value ${enableval} for --enable-schemas-compile" "$LINENO" 5 ;;
+                 esac
+fi
+
+
+
+
+
+
+
+
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_path_PKG_CONFIG"; then
+  ac_pt_PKG_CONFIG=$PKG_CONFIG
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $ac_pt_PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
+if test -n "$ac_pt_PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_pt_PKG_CONFIG" = x; then
+    PKG_CONFIG=""
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    PKG_CONFIG=$ac_pt_PKG_CONFIG
+  fi
+else
+  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
+fi
+
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=0.16
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	else
+		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+		PKG_CONFIG=""
+	fi
+fi
+  gsettingsschemadir=${datadir}/glib-2.0/schemas
+
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    # Extract the first word of "glib-compile-schemas", so it can be a program name with args.
+set dummy glib-compile-schemas; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_path_GLIB_COMPILE_SCHEMAS+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $GLIB_COMPILE_SCHEMAS in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_GLIB_COMPILE_SCHEMAS="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+  ;;
+esac
+fi
+GLIB_COMPILE_SCHEMAS=$ac_cv_path_GLIB_COMPILE_SCHEMAS
+if test -n "$GLIB_COMPILE_SCHEMAS"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_SCHEMAS" >&5
+$as_echo "$GLIB_COMPILE_SCHEMAS" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  fi
+
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5
+  else
+    :
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch $@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" $^ > $@.tmp && mv $@.tmp $@
+endif
+'
+
+
+
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5
 $as_echo_n "checking whether NLS is requested... " >&6; }
     # Check whether --enable-nls was given.
@@ -12776,7 +12995,7 @@ AM_BACKSLASH='\'
 GTK_REQUIRED_VERSION=2.12
 GTK3_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.19
-DBUSMENUGTK_REQUIRED_VERSION=0.3.91
+DBUSMENUGTK_REQUIRED_VERSION=0.4.92
 POLKIT_REQUIRED_VERSION=0.92
 
 
@@ -12788,126 +13007,6 @@ else
 fi
 
 
-
-
-
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-if test -n "$PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
-$as_echo "$PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-if test -n "$ac_pt_PKG_CONFIG"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
-$as_echo "$ac_pt_PKG_CONFIG" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-  if test "x$ac_pt_PKG_CONFIG" = x; then
-    PKG_CONFIG=""
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    PKG_CONFIG=$ac_pt_PKG_CONFIG
-  fi
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
-$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
-fi
 if test "x$with_gtk" = x3; then :
 
 pkg_failed=no
@@ -13635,192 +13734,6 @@ fi
 
 
 
-# Extract the first word of "gconftool-2", so it can be a program name with args.
-set dummy gconftool-2; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GCONFTOOL+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $GCONFTOOL in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_GCONFTOOL="$GCONFTOOL" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_GCONFTOOL="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-GCONFTOOL=$ac_cv_path_GCONFTOOL
-if test -n "$GCONFTOOL"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONFTOOL" >&5
-$as_echo "$GCONFTOOL" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-
-
-  if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then
-    GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  else
-    GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
-  fi
-
-
-# Check whether --with-gconf-source was given.
-if test "${with_gconf_source+set}" = set; then :
-  withval=$with_gconf_source; GCONF_SCHEMA_CONFIG_SOURCE="$withval"
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&5
-$as_echo "Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation" >&6; }
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-
-# Check whether --with-gconf-schema-file-dir was given.
-if test "${with_gconf_schema_file_dir+set}" = set; then :
-  withval=$with_gconf_schema_file_dir; GCONF_SCHEMA_FILE_DIR="$withval"
-fi
-
-
-
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&5
-$as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >&6; }
-
-  # Check whether --enable-schemas-install was given.
-if test "${enable_schemas_install+set}" = set; then :
-  enableval=$enable_schemas_install; case ${enableval} in
-       yes|no) ;;
-       *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;;
-      esac
-fi
-
-   if test "$enable_schemas_install" != no; then
-  GCONF_SCHEMAS_INSTALL_TRUE=
-  GCONF_SCHEMAS_INSTALL_FALSE='#'
-else
-  GCONF_SCHEMAS_INSTALL_TRUE='#'
-  GCONF_SCHEMAS_INSTALL_FALSE=
-fi
-
-
-
-
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GCONF" >&5
-$as_echo_n "checking for GCONF... " >&6; }
-
-if test -n "$GCONF_CFLAGS"; then
-    pkg_cv_GCONF_CFLAGS="$GCONF_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= 2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-if test -n "$GCONF_LIBS"; then
-    pkg_cv_GCONF_LIBS="$GCONF_LIBS"
- elif test -n "$PKG_CONFIG"; then
-    if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gconf-2.0 >= 2.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gconf-2.0 >= 2.0") 2>&5
-  ac_status=$?
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }; then
-  pkg_cv_GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 >= 2.0" 2>/dev/null`
-		      test "x$?" != "x0" && pkg_failed=yes
-else
-  pkg_failed=yes
-fi
- else
-    pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi
-        if test $_pkg_short_errors_supported = yes; then
-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gconf-2.0 >= 2.0" 2>&1`
-        else
-	        GCONF_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gconf-2.0 >= 2.0" 2>&1`
-        fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$GCONF_PKG_ERRORS" >&5
-
-	as_fn_error $? "Package requirements (gconf-2.0 >= 2.0) were not met:
-
-$GCONF_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GCONF_CFLAGS
-and GCONF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GCONF_CFLAGS
-and GCONF_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
-	GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS
-	GCONF_LIBS=$pkg_cv_GCONF_LIBS
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
-
-
-
 ###########################
 # Check to see if we're local
 ###########################
@@ -14741,10 +14654,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then
-  as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
diff --git a/configure.ac b/configure.ac
index 0240b9c..8e5ed8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.3.2)
+AM_INIT_AUTOMAKE(indicator-session, 0.3.3.2)
 
 AM_MAINTAINER_MODE
 
@@ -30,7 +30,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 GTK_REQUIRED_VERSION=2.12
 GTK3_REQUIRED_VERSION=3.0
 INDICATOR_REQUIRED_VERSION=0.3.19
-DBUSMENUGTK_REQUIRED_VERSION=0.3.91
+DBUSMENUGTK_REQUIRED_VERSION=0.4.92
 POLKIT_REQUIRED_VERSION=0.92
 
 AC_ARG_WITH([gtk],
diff --git a/data/Makefile.am b/data/Makefile.am
index 347f91f..7e851a7 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,9 +21,13 @@ dist_convert_DATA = indicator-session.convert
 @INTLTOOL_DESKTOP_RULE@
 
 %.desktop.in: %.desktop.in.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	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
@@ -31,6 +35,7 @@ logout_helper_desktop_in_in_files = \
 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)			\
diff --git a/data/Makefile.in b/data/Makefile.in
index fa8909e..388d645 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -35,7 +35,8 @@ 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__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -81,8 +82,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 +151,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 +246,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 +282,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 +365,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 +604,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 +653,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 +698,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 +709,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
index 0cb6815..d1d7d4c 100644
--- a/data/com.canonical.indicator.session.gschema.xml.in
+++ b/data/com.canonical.indicator.session.gschema.xml.in
@@ -8,17 +8,17 @@
     <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>
+      <_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>
+      <_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>
+      <_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..3023eeb 100644
--- a/data/extra-sessions/Makefile.in
+++ b/data/extra-sessions/Makefile.in
@@ -112,16 +112,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 +207,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..75fccfb 100644
--- a/data/icons/16x16/Makefile.in
+++ b/data/icons/16x16/Makefile.in
@@ -124,16 +124,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 +219,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..126b01f 100644
--- a/data/icons/16x16/actions/Makefile.in
+++ b/data/icons/16x16/actions/Makefile.in
@@ -108,16 +108,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 +203,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..056f29e 100644
--- a/data/icons/16x16/status/Makefile.in
+++ b/data/icons/16x16/status/Makefile.in
@@ -108,16 +108,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 +203,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..1f2c832 100644
--- a/data/icons/22x22/Makefile.in
+++ b/data/icons/22x22/Makefile.in
@@ -124,16 +124,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 +219,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..2fadd27 100644
--- a/data/icons/22x22/actions/Makefile.in
+++ b/data/icons/22x22/actions/Makefile.in
@@ -108,16 +108,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 +203,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..f2dedb6 100644
--- a/data/icons/22x22/status/Makefile.in
+++ b/data/icons/22x22/status/Makefile.in
@@ -108,16 +108,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 +203,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..8d01216 100644
--- a/data/icons/24x24/Makefile.in
+++ b/data/icons/24x24/Makefile.in
@@ -124,16 +124,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 +219,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..fca474b 100644
--- a/data/icons/24x24/actions/Makefile.in
+++ b/data/icons/24x24/actions/Makefile.in
@@ -108,16 +108,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 +203,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..c65119f 100644
--- a/data/icons/24x24/status/Makefile.in
+++ b/data/icons/24x24/status/Makefile.in
@@ -108,16 +108,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 +203,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..d59ffc7 100644
--- a/data/icons/32x32/Makefile.in
+++ b/data/icons/32x32/Makefile.in
@@ -124,16 +124,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 +219,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..11df9e1 100644
--- a/data/icons/32x32/actions/Makefile.in
+++ b/data/icons/32x32/actions/Makefile.in
@@ -108,16 +108,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 +203,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..3bda79f 100644
--- a/data/icons/32x32/status/Makefile.in
+++ b/data/icons/32x32/status/Makefile.in
@@ -108,16 +108,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 +203,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..8f0e112 100644
--- a/data/icons/Makefile.in
+++ b/data/icons/Makefile.in
@@ -124,16 +124,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 +219,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..9a4d23a 100644
--- a/data/icons/scalable/Makefile.in
+++ b/data/icons/scalable/Makefile.in
@@ -124,16 +124,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 +219,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..3467ab6 100644
--- a/data/icons/scalable/actions/Makefile.in
+++ b/data/icons/scalable/actions/Makefile.in
@@ -108,16 +108,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 +203,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..b2ba18d 100644
--- a/data/icons/scalable/status/Makefile.in
+++ b/data/icons/scalable/status/Makefile.in
@@ -108,16 +108,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 +203,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
index 78548d1..46ba087 100644
--- a/data/indicator-session-logout.desktop.in.in
+++ b/data/indicator-session-logout.desktop.in.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
 _Name=Log Out
-Try-Exec=@libexecdir@/gtk-logout-helper
+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
index 68a2f7f..67aa390 100644
--- a/data/indicator-session-restart.desktop.in.in
+++ b/data/indicator-session-restart.desktop.in.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
 _Name=Restart
-Try-Exec=@libexecdir@/gtk-logout-helper
+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
index 419a952..4bd51fe 100644
--- a/data/indicator-session-shutdown.desktop.in.in
+++ b/data/indicator-session-shutdown.desktop.in.in
@@ -1,8 +1,9 @@
 [Desktop Entry]
 _Name=Shut Down
-Try-Exec=@libexecdir@/gtk-logout-helper
+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/debian/changelog b/debian/changelog
index 2c062db..62a2e16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,41 @@
+indicator-session (0.3.3.2-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Don't set LC_ALL to C
+  * debian/rules
+    - dh_translations doesn't handle multibuilds, so manually add the domain
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Fri, 26 Aug 2011 09:49:37 -0400
+
+indicator-session (0.3.3.1-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Fixed string displayed for users name on single user systems 
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 25 Aug 2011 15:25:40 -0400
+
+indicator-session (0.3.3-0ubuntu2) oneiric; urgency=low
+
+  * src/udev-mgr.c
+    - Cherry picked fix for (LP: #833795)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 25 Aug 2011 12:56:17 -0400
+
+indicator-session (0.3.3-0ubuntu1) oneiric; urgency=low
+
+  * 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)
+  * debian/control
+    - Bump dbusmenu build dep to >= 0.4.92
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Thu, 25 Aug 2011 08:58:56 -0400
+
 indicator-session (0.3.2-0ubuntu2~ppa3) UNRELEASED; urgency=low
 
   * Upstream Merge
diff --git a/debian/control b/debian/control
index af1db07..b7b19de 100644
--- a/debian/control
+++ b/debian/control
@@ -12,9 +12,9 @@ Build-Depends: debhelper (>= 5.0),
                gnome-doc-utils,
                libindicator-dev (>= 0.3.90),
                libindicator3-dev (>= 0.3.90),
-               libdbusmenu-glib-dev (>= 0.3.90),
-               libdbusmenu-gtk-dev (>= 0.3.94),
-               libdbusmenu-gtk3-dev (>= 0.3.94),
+               libdbusmenu-glib-dev (>= 0.4.92),
+               libdbusmenu-gtk-dev (>= 0.4.92),
+               libdbusmenu-gtk3-dev (>= 0.4.92),
                libpolkit-gobject-1-dev,
                intltool
 Standards-Version: 3.9.2
diff --git a/debian/rules b/debian/rules
index 3691179..a393364 100755..100644
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,6 @@ DEB_MAKE_FLAVORS = gtk2 gtk3
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/gnome.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
 
 DEB_MAKE_DESTDIRSKEL = $(CURDIR)/debian/tmp/@FLAVOR@
 DEB_DESTDIR = $(CURDIR)/debian/tmp/$(cdbs_make_curflavor)/
@@ -24,4 +23,10 @@ common-install-arch::
 	find debian/tmp -name \*.a -delete
 	find debian/tmp -name classic-desktop.sh | xargs chmod +x
 	cd po; intltool-update --pot --verbose
+	# Language packs
+	for d in $$(find debian/tmp -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
+		sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \
+		echo "X-Ubuntu-Gettext-Domain=indicator-session" >> $$d; \
+	done;
+
 
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 7253dd6..18b5d9b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,7 @@
 [encoding: UTF-8]
 data/com.canonical.indicator.session.gschema.xml.in
 data/extra-sessions/classic-desktop.desktop.in.in
+data/indicator-session-lock-screen.desktop.in.in
 data/indicator-session-shutdown.desktop.in.in
 data/indicator-session-logout.desktop.in.in
 data/indicator-session-restart.desktop.in.in
@@ -13,3 +14,4 @@ src/session-service.c
 src/apt-watcher.c
 src/device-menu-mgr.c
 src/user-menu-mgr.c
+src/udev-mgr.c
diff --git a/src/Makefile.in b/src/Makefile.in
index ae051cb..693b442 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -85,11 +85,11 @@ libsession_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 PROGRAMS = $(libexec_PROGRAMS)
 am_gtk_logout_helper_OBJECTS =  \
 	gtk_logout_helper-gtk-logout-helper.$(OBJEXT) \
-	gtk_logout_helper-gconf-helper.$(OBJEXT) \
+	gtk_logout_helper-settings-helper.$(OBJEXT) \
 	gtk_logout_helper-dialog.$(OBJEXT)
 gtk_logout_helper_OBJECTS = $(am_gtk_logout_helper_OBJECTS)
 gtk_logout_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+	$(am__DEPENDENCIES_1)
 gtk_logout_helper_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(gtk_logout_helper_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
@@ -99,7 +99,7 @@ am_indicator_session_service_OBJECTS =  \
 	indicator_session_service-session-service.$(OBJEXT) \
 	indicator_session_service-session-dbus.$(OBJEXT) \
 	indicator_session_service-gen-session-dbus.xml.$(OBJEXT) \
-	indicator_session_service-gconf-helper.$(OBJEXT) \
+	indicator_session_service-settings-helper.$(OBJEXT) \
 	indicator_session_service-users-service-dbus.$(OBJEXT) \
 	indicator_session_service-user-menu-mgr.$(OBJEXT) \
 	indicator_session_service-device-menu-mgr.$(OBJEXT) \
@@ -108,8 +108,7 @@ am_indicator_session_service_OBJECTS =  \
 	indicator_session_service-udev-mgr.$(OBJEXT)
 indicator_session_service_OBJECTS =  \
 	$(am_indicator_session_service_OBJECTS)
-indicator_session_service_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1)
+indicator_session_service_DEPENDENCIES = $(am__DEPENDENCIES_1)
 indicator_session_service_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(indicator_session_service_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
@@ -179,16 +178,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@
@@ -277,6 +273,7 @@ datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
+gsettingsschemadir = @gsettingsschemadir@
 host = @host@
 host_alias = @host_alias@
 host_cpu = @host_cpu@
@@ -340,7 +337,7 @@ indicator_session_service_SOURCES = \
 	session-dbus.h \
 	gen-session-dbus.xml.c \
 	dbusmenu-shared.h \
-	gconf-helper.c \
+	settings-helper.c \
 	users-service-dbus.h \
 	users-service-dbus.c \
 	user-menu-mgr.h \
@@ -372,8 +369,8 @@ indicator_session_service_LDADD = \
 #################
 gtk_logout_helper_SOURCES = \
 	gtk-logout-helper.c \
-	gconf-helper.c \
-	gconf-helper.h \
+	settings-helper.c \
+	settings-helper.h \
 	dialog.c \
 	dialog.h
 
@@ -542,16 +539,16 @@ distclean-compile:
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_logout_helper-dialog.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_logout_helper-gconf-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_logout_helper-gtk-logout-helper.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk_logout_helper-settings-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-apt-transaction.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-apt-watcher.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-device-menu-mgr.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-gconf-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-gen-session-dbus.xml.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-lock-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-session-dbus.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-session-service.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-settings-helper.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-udev-mgr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-user-menu-mgr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/indicator_session_service-users-service-dbus.Po@am__quote@
@@ -614,21 +611,21 @@ gtk_logout_helper-gtk-logout-helper.obj: gtk-logout-helper.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-gtk-logout-helper.obj `if test -f 'gtk-logout-helper.c'; then $(CYGPATH_W) 'gtk-logout-helper.c'; else $(CYGPATH_W) '$(srcdir)/gtk-logout-helper.c'; fi`
 
-gtk_logout_helper-gconf-helper.o: gconf-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-gconf-helper.o -MD -MP -MF $(DEPDIR)/gtk_logout_helper-gconf-helper.Tpo -c -o gtk_logout_helper-gconf-helper.o `test -f 'gconf-helper.c' || echo '$(srcdir)/'`gconf-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-gconf-helper.Tpo $(DEPDIR)/gtk_logout_helper-gconf-helper.Po
+gtk_logout_helper-settings-helper.o: settings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-settings-helper.o -MD -MP -MF $(DEPDIR)/gtk_logout_helper-settings-helper.Tpo -c -o gtk_logout_helper-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-settings-helper.Tpo $(DEPDIR)/gtk_logout_helper-settings-helper.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconf-helper.c' object='gtk_logout_helper-gconf-helper.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings-helper.c' object='gtk_logout_helper-settings-helper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-gconf-helper.o `test -f 'gconf-helper.c' || echo '$(srcdir)/'`gconf-helper.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
 
-gtk_logout_helper-gconf-helper.obj: gconf-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-gconf-helper.obj -MD -MP -MF $(DEPDIR)/gtk_logout_helper-gconf-helper.Tpo -c -o gtk_logout_helper-gconf-helper.obj `if test -f 'gconf-helper.c'; then $(CYGPATH_W) 'gconf-helper.c'; else $(CYGPATH_W) '$(srcdir)/gconf-helper.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-gconf-helper.Tpo $(DEPDIR)/gtk_logout_helper-gconf-helper.Po
+gtk_logout_helper-settings-helper.obj: settings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-settings-helper.obj -MD -MP -MF $(DEPDIR)/gtk_logout_helper-settings-helper.Tpo -c -o gtk_logout_helper-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/gtk_logout_helper-settings-helper.Tpo $(DEPDIR)/gtk_logout_helper-settings-helper.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconf-helper.c' object='gtk_logout_helper-gconf-helper.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings-helper.c' object='gtk_logout_helper-settings-helper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-gconf-helper.obj `if test -f 'gconf-helper.c'; then $(CYGPATH_W) 'gconf-helper.c'; else $(CYGPATH_W) '$(srcdir)/gconf-helper.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -c -o gtk_logout_helper-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
 
 gtk_logout_helper-dialog.o: dialog.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(gtk_logout_helper_CFLAGS) $(CFLAGS) -MT gtk_logout_helper-dialog.o -MD -MP -MF $(DEPDIR)/gtk_logout_helper-dialog.Tpo -c -o gtk_logout_helper-dialog.o `test -f 'dialog.c' || echo '$(srcdir)/'`dialog.c
@@ -710,21 +707,21 @@ indicator_session_service-gen-session-dbus.xml.obj: gen-session-dbus.xml.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-gen-session-dbus.xml.obj `if test -f 'gen-session-dbus.xml.c'; then $(CYGPATH_W) 'gen-session-dbus.xml.c'; else $(CYGPATH_W) '$(srcdir)/gen-session-dbus.xml.c'; fi`
 
-indicator_session_service-gconf-helper.o: gconf-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-gconf-helper.o -MD -MP -MF $(DEPDIR)/indicator_session_service-gconf-helper.Tpo -c -o indicator_session_service-gconf-helper.o `test -f 'gconf-helper.c' || echo '$(srcdir)/'`gconf-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-gconf-helper.Tpo $(DEPDIR)/indicator_session_service-gconf-helper.Po
+indicator_session_service-settings-helper.o: settings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-settings-helper.o -MD -MP -MF $(DEPDIR)/indicator_session_service-settings-helper.Tpo -c -o indicator_session_service-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-settings-helper.Tpo $(DEPDIR)/indicator_session_service-settings-helper.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconf-helper.c' object='indicator_session_service-gconf-helper.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings-helper.c' object='indicator_session_service-settings-helper.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-gconf-helper.o `test -f 'gconf-helper.c' || echo '$(srcdir)/'`gconf-helper.c
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-settings-helper.o `test -f 'settings-helper.c' || echo '$(srcdir)/'`settings-helper.c
 
-indicator_session_service-gconf-helper.obj: gconf-helper.c
-@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-gconf-helper.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-gconf-helper.Tpo -c -o indicator_session_service-gconf-helper.obj `if test -f 'gconf-helper.c'; then $(CYGPATH_W) 'gconf-helper.c'; else $(CYGPATH_W) '$(srcdir)/gconf-helper.c'; fi`
-@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-gconf-helper.Tpo $(DEPDIR)/indicator_session_service-gconf-helper.Po
+indicator_session_service-settings-helper.obj: settings-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-settings-helper.obj -MD -MP -MF $(DEPDIR)/indicator_session_service-settings-helper.Tpo -c -o indicator_session_service-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/indicator_session_service-settings-helper.Tpo $(DEPDIR)/indicator_session_service-settings-helper.Po
 @am__fastdepCC_FALSE@	$(AM_V_CC) @AM_BACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gconf-helper.c' object='indicator_session_service-gconf-helper.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings-helper.c' object='indicator_session_service-settings-helper.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-gconf-helper.obj `if test -f 'gconf-helper.c'; then $(CYGPATH_W) 'gconf-helper.c'; else $(CYGPATH_W) '$(srcdir)/gconf-helper.c'; fi`
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -c -o indicator_session_service-settings-helper.obj `if test -f 'settings-helper.c'; then $(CYGPATH_W) 'settings-helper.c'; else $(CYGPATH_W) '$(srcdir)/settings-helper.c'; fi`
 
 indicator_session_service-users-service-dbus.o: users-service-dbus.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(indicator_session_service_CFLAGS) $(CFLAGS) -MT indicator_session_service-users-service-dbus.o -MD -MP -MF $(DEPDIR)/indicator_session_service-users-service-dbus.Tpo -c -o indicator_session_service-users-service-dbus.o `test -f 'users-service-dbus.c' || echo '$(srcdir)/'`users-service-dbus.c
diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 7d706a0..a4298a8 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -279,6 +279,9 @@ apt_watcher_transaction_state_update_cb (AptTransaction* trans,
       dbusmenu_menuitem_property_set (self->apt_item,
                                       DBUSMENU_MENUITEM_PROP_LABEL,
                                       _("Reboot Required"));
+      dbusmenu_menuitem_property_set (self->apt_item,
+                                      DBUSMENU_MENUITEM_PROP_DISPOSITION,
+                                      DBUSMENU_MENUITEM_DISPOSITION_ALERT);                                       
       session_dbus_restart_required (self->session_dbus_interface);
     }
     g_debug ("Finished with a reboot value of %i", reboot); 
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c
index c298682..523ea8d 100644
--- a/src/device-menu-mgr.c
+++ b/src/device-menu-mgr.c
@@ -49,7 +49,6 @@ static GSettings         *keybinding_settings  = NULL;
 static DbusmenuMenuitem  *lock_menuitem = NULL;
 static DbusmenuMenuitem  *system_settings_menuitem = NULL;
 static DbusmenuMenuitem  *display_settings_menuitem = NULL;
-static DbusmenuMenuitem  *bluetooth_settings_menuitem = NULL;
 static DbusmenuMenuitem  *login_settings_menuitem = NULL;
 static DbusmenuMenuitem  *software_updates_menuitem = NULL;
 static DbusmenuMenuitem  *printers_menuitem = NULL;
@@ -535,17 +534,6 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self)
   dbusmenu_menuitem_child_add_position(self->root_item,
                                        display_settings_menuitem,
                                        1);
-  bluetooth_settings_menuitem = dbusmenu_menuitem_new();
-  dbusmenu_menuitem_property_set (bluetooth_settings_menuitem,
-                                  DBUSMENU_MENUITEM_PROP_LABEL,
-                                  _("Bluetooth…"));
-  g_signal_connect (G_OBJECT(bluetooth_settings_menuitem),
-                    DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
-                    G_CALLBACK(show_system_settings_with_context), "bluetooth");
-  dbusmenu_menuitem_child_add_position(self->root_item,
-                                       bluetooth_settings_menuitem,
-                                       2);
-
   login_settings_menuitem = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (login_settings_menuitem,
                                   DBUSMENU_MENUITEM_PROP_LABEL,
@@ -556,20 +544,20 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self)
                     "login");
   dbusmenu_menuitem_child_add_position(self->root_item,
                                        login_settings_menuitem,                                  
-                                       3);
+                                       2);
   software_updates_menuitem = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (software_updates_menuitem,
                                   DBUSMENU_MENUITEM_PROP_LABEL,
                                   _("Software Up to Date"));
   dbusmenu_menuitem_child_add_position(self->root_item,
                                        software_updates_menuitem,
-                                       4);
+                                       3);
 
   DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (separator1,
                                   DBUSMENU_MENUITEM_PROP_TYPE,
                                   DBUSMENU_CLIENT_TYPES_SEPARATOR);
-  dbusmenu_menuitem_child_add_position (self->root_item, separator1, 5);
+  dbusmenu_menuitem_child_add_position (self->root_item, separator1, 4);
 }
 
 static void
@@ -584,7 +572,7 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
                                        FALSE);
   dbusmenu_menuitem_child_add_position (self->root_item,
                                         device_heading,
-                                        6);
+                                        5);
 
   printers_menuitem = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (printers_menuitem,
@@ -596,7 +584,7 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
                     "printers");
   dbusmenu_menuitem_child_add_position(self->root_item,
                                        printers_menuitem,
-                                       7);
+                                       6);
   scanners_menuitem = dbusmenu_menuitem_new();
   dbusmenu_menuitem_property_set (scanners_menuitem,
                                   DBUSMENU_MENUITEM_PROP_LABEL,
@@ -607,7 +595,7 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
                     NULL);
   dbusmenu_menuitem_child_add_position (self->root_item,
                                         scanners_menuitem,
-                                        8);
+                                        7);
   dbusmenu_menuitem_property_set_bool (scanners_menuitem,
                                        DBUSMENU_MENUITEM_PROP_VISIBLE,
                                        FALSE);
@@ -622,7 +610,7 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
                     NULL);
   dbusmenu_menuitem_child_add_position (self->root_item,
                                         webcam_menuitem,
-                                        10);
+                                        8);
   dbusmenu_menuitem_property_set_bool (webcam_menuitem,
                                        DBUSMENU_MENUITEM_PROP_VISIBLE,
                                        FALSE);
@@ -631,7 +619,7 @@ device_menu_mgr_build_devices_items (DeviceMenuMgr* self)
   dbusmenu_menuitem_property_set (separator3,
                                   DBUSMENU_MENUITEM_PROP_TYPE,
                                   DBUSMENU_CLIENT_TYPES_SEPARATOR);
-  dbusmenu_menuitem_child_add_position (self->root_item, separator3, 11);
+  dbusmenu_menuitem_child_add_position (self->root_item, separator3, 9);
 }
 
 static void
@@ -752,7 +740,6 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self, gboolean greeter_mode)
   self->udev_mgr = udev_mgr_new (scanners_menuitem, webcam_menuitem);   
 }
 
-
 static void
 device_menu_mgr_rebuild_items (DeviceMenuMgr* self)
 {
@@ -833,7 +820,6 @@ device_menu_mgr_ensure_settings_client (DeviceMenuMgr* self)
 		keybinding_settings = g_settings_new (KEYBINDING_SCHEMA);
 		g_signal_connect(lockdown_settings, "changed::" KEY_LOCK_SCREEN, G_CALLBACK(keybinding_changed), self);
 	}
-
 	return;
 }
 
diff --git a/src/dialog.c b/src/dialog.c
index 45cfdcb..4b139ca 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -62,7 +62,7 @@ static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
    in place of a log out. */
 static const gchar * restart_updates = N_("Restart Instead");
 static const gchar * restart_auth = N_("Restart Instead…");
-static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts.");
+static const gchar * body_logout_update = N_("Some software updates won’t apply until the computer next restarts.");
 
 static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = {
 	/* LOGOUT_DIALOG_LOGOUT, */ 	"system-log-out",
diff --git a/src/udev-mgr.c b/src/udev-mgr.c
index f66d862..edc2262 100644
--- a/src/udev-mgr.c
+++ b/src/udev-mgr.c
@@ -19,11 +19,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <gudev/gudev.h>
 
-// TEMP
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
+#include <glib/gi18n.h>
 
 #include "udev-mgr.h"
 #include "sane-rules.h"
@@ -53,7 +49,10 @@ static void debug_device (UdevMgr* self,
                           GUdevDevice* device,
                           UdevMgrDeviceAction action);
                           
-
+static gchar* format_device_name (UdevMgr* self,
+                                  const gchar* brand,
+                                  const gchar* generic,
+                                  const gchar* branded) G_GNUC_WARN_UNUSED_RESULT;
 struct _UdevMgr
 {
 	GObject parent_instance;
@@ -235,13 +234,27 @@ udev_mgr_handle_webcam (UdevMgr* self,
     }
     g_hash_table_remove (self->webcams_present,
                          product);
-    
+    dbusmenu_menuitem_property_set (self->webcam_item,
+                                    DBUSMENU_MENUITEM_PROP_LABEL,
+                                    _("Webcam"));                            
   }
   else {
     if (g_hash_table_lookup (self->webcams_present, product) != NULL){
       g_warning ("Got an ADD event on a webcam device but we already have that device in our webcam cache");
       return;                     
     }
+    
+    const gchar* manufacturer = NULL;        
+    manufacturer = g_udev_device_get_property (device, "ID_VENDOR");
+    
+    if (manufacturer != NULL){
+	  gchar * label = format_device_name(self, manufacturer, _("Webcam"), _("%s Webcam"));
+      dbusmenu_menuitem_property_set (self->webcam_item,
+                                      DBUSMENU_MENUITEM_PROP_LABEL,
+                                      label);
+	  g_free(label);
+    }
+    
     g_hash_table_insert (self->webcams_present,
                          g_strdup (product),
                          g_strdup (vendor));                               
@@ -254,23 +267,26 @@ debug_device (UdevMgr* self,
               GUdevDevice* device,
               UdevMgrDeviceAction action)
 {
-  /*const gchar* vendor;
+  const gchar* vendor;
   const gchar* product;
   const gchar* number;
   const gchar* name;
+  const gchar* manufacturer;
   
 	vendor = g_udev_device_get_property (device, "ID_VENDOR_ID");
+	manufacturer = g_udev_device_get_property (device, "ID_VENDOR");
 	product = g_udev_device_get_property (device, "ID_MODEL_ID");
   number = g_udev_device_get_number (device);
   name = g_udev_device_get_name (device);
   
-  g_debug ("device vendor id %s , product id of %s , number of %s and name of %s",
+  g_debug ("%s device vendor id %s , product id of %s , number of %s and name of %s",
+           g_strdup(manufacturer),
            g_strdup(vendor),
            g_strdup(product),
            g_strdup(number),
            g_strdup(name));
          
-  const gchar *const *list;
+  /*const gchar *const *list;
   const gchar *const *iter;  
   char propstr[500];
   guint32 namelen = 0, i;  
@@ -290,9 +306,10 @@ debug_device (UdevMgr* self,
            strcat(propstr, " ");
     strcat(propstr, g_udev_device_get_property(device, *iter));
     g_debug("%s", propstr);
-  }*/  
+  }*/ 
 }
-
+// TODO SCSI is not dynamic right ?
+// i.e. just need to handle startup scan.
 static void udev_mgr_handle_scsi_device (UdevMgr* self,
                                          GUdevDevice* device,
                                          UdevMgrDeviceAction action)
@@ -300,7 +317,19 @@ static void udev_mgr_handle_scsi_device (UdevMgr* self,
   const gchar* type = NULL;
 	type = g_udev_device_get_property (device, "TYPE");
   // apparently anything thats type 3 and SCSI is a Scanner
-  if (g_strcmp0 (type, "6") == 0){
+  if (g_strcmp0 (type, "6") == 0 && action == ADD){
+    
+    const gchar* manufacturer = NULL;        
+    manufacturer = g_udev_device_get_property (device, "ID_VENDOR");
+    
+    if (manufacturer != NULL){
+	  gchar * label = format_device_name(self, manufacturer, _("Scanner"), _("%s Scanner"));
+      dbusmenu_menuitem_property_set (self->scanner_item,
+                                      DBUSMENU_MENUITEM_PROP_LABEL,
+                                      label);
+	  g_free(label);
+    }
+    
     gchar* random_scanner_name = 	g_strdup_printf("%p--scanner", self);
     g_hash_table_insert (self->scanners_present,
                          random_scanner_name,
@@ -344,6 +373,10 @@ static void udev_mgr_handle_scsi_device (UdevMgr* self,
       }
       else{
         g_hash_table_remove (self->scanners_present, vendor);
+        dbusmenu_menuitem_property_set (self->scanner_item,
+                                        DBUSMENU_MENUITEM_PROP_LABEL,
+                                        _("Scanner"));
+        
       }
     }
     else{      
@@ -351,6 +384,16 @@ static void udev_mgr_handle_scsi_device (UdevMgr* self,
         g_warning ("Got an ADD event on a scanner device but we already have that device in our scanners cache");
       }
       else{
+        const gchar* manufacturer = NULL;        
+        manufacturer = g_udev_device_get_property (device, "ID_VENDOR");
+        
+        if (manufacturer != NULL){
+          gchar * label = format_device_name(self, manufacturer, _("Scanner"), _("%s Scanner"));
+          dbusmenu_menuitem_property_set (self->scanner_item,
+                                          DBUSMENU_MENUITEM_PROP_LABEL,
+                                          label);
+          g_free(label);
+        }
         g_hash_table_insert (self->scanners_present,
                              g_strdup(vendor),
                              g_strdup(model_id)); 
@@ -366,7 +409,7 @@ udev_mgr_check_if_usb_device_is_supported (UdevMgr* self,
                                            UdevMgrDeviceAction action)
 {
   const gchar* vendor = NULL;
-  debug_device (self, device, action);    
+  //debug_device (self, device, action);    
   
 	vendor = g_udev_device_get_property (device, "ID_VENDOR_ID");
   
@@ -397,6 +440,9 @@ udev_mgr_check_if_usb_device_is_supported (UdevMgr* self,
       }
       else{
         g_hash_table_remove (self->scanners_present, vendor);
+        dbusmenu_menuitem_property_set (self->scanner_item, 
+                                        DBUSMENU_MENUITEM_PROP_LABEL,
+                                        _("Scanner"));        
       }
     }
     else{      
@@ -404,6 +450,17 @@ udev_mgr_check_if_usb_device_is_supported (UdevMgr* self,
         g_warning ("Got an ADD event on a scanner device but we already have that device in our scanners cache");
       }
       else{
+        const gchar* manufacturer = NULL;
+        
+        manufacturer = g_udev_device_get_property (device, "ID_VENDOR");
+        if (manufacturer != NULL){
+          gchar * label = format_device_name(self, manufacturer, _("Scanner"), _("%s Scanner"));
+          dbusmenu_menuitem_property_set (self->scanner_item, 
+                                          DBUSMENU_MENUITEM_PROP_LABEL,
+                                          label);
+          g_free(label);
+        }
+                                        
         g_hash_table_insert (self->scanners_present,
                              g_strdup(vendor),
                              g_strdup(model_id)); 
@@ -454,3 +511,27 @@ UdevMgr* udev_mgr_new (DbusmenuMenuitem* scanner,
   }
   return mgr;
 }
+
+static gchar* format_device_name (UdevMgr* self,
+                                  const gchar* brand,
+                                  const gchar* generic,
+                                  const gchar* branded)
+{
+  // We don't want to accommodate long names
+  if (strlen(brand) > 7)
+    return g_strdup(generic);
+
+  gint i = 0;
+
+  // If it contains something other than an alphabetic entry ignore it.
+  for(i = 0; i < sizeof(brand); i++){
+    if ( !g_ascii_isalpha (brand[i]) )
+      return g_strdup(generic);
+  }
+
+  gchar* lowered = g_ascii_strdown (brand, -1);
+  lowered[0] = g_ascii_toupper (lowered[0]);
+  gchar* label = g_strdup_printf(branded, lowered);
+  g_free (lowered);  
+  return label;
+}
diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c
index 5ac1c63..1b404d3 100644
--- a/src/user-menu-mgr.c
+++ b/src/user-menu-mgr.c
@@ -52,6 +52,10 @@ static gint compare_users_by_username (const gchar *a,
 static void activate_online_accounts (DbusmenuMenuitem *mi,
                                       guint timestamp,
                                       gpointer user_data);
+static void activate_user_accounts (DbusmenuMenuitem *mi,
+                                    guint timestamp,
+                                    gpointer user_data);
+                                      
 static void user_menu_mgr_rebuild_items (UserMenuMgr *self,
                                          gboolean greeter_mode);
 static gboolean check_new_session ();
@@ -172,7 +176,7 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
     gboolean user_menu_is_visible = FALSE;
     
     if (!greeter_mode){
-      user_menu_is_visible = self->user_count > 1;
+      user_menu_is_visible = self->user_count > 1 || check_guest_session();
     }
     
     session_dbus_set_user_menu_visibility (self->session_dbus_interface,
@@ -184,17 +188,29 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
 
     for (u = users; u != NULL; u = g_list_next (u)) {
       user = u->data;
-      g_debug ("%p: %s", user, user->real_name);      
+      //g_debug ("%p: %s", user, user->real_name);      
       user->service = self->users_dbus_interface;
-
+      gboolean current_user = g_strcmp0 (user->user_name, g_get_user_name()) == 0;  
+      if (current_user == TRUE){
+        if (check_guest_session()){
+          g_debug ("about to set the users real name to %s for user %s",
+                    user->real_name, user->user_name);
+          session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
+        }
+        else{
+          g_debug ("about to set the users real name to GUEST");            
+          session_dbus_set_users_real_name (self->session_dbus_interface,
+                                            _("Guest"));            
+        }            
+      }
+           
+      
       if (g_strcmp0(user->user_name, "guest") == 0) {
         /* Check to see if the guest has sessions and so therefore should
            get a check mark. */
-        if (user->sessions != NULL) {
-          dbusmenu_menuitem_property_set_bool (guest_mi,
-                                               USER_ITEM_PROP_LOGGED_IN,
-                                               TRUE);
-        }
+        dbusmenu_menuitem_property_set_bool (guest_mi,
+                                             USER_ITEM_PROP_LOGGED_IN,
+                                             user->sessions != NULL);
         /* If we're showing user accounts, keep going through the list */
         if (self->user_count > MINIMUM_USERS && self->user_count < MAXIMUM_USERS) {
           continue;
@@ -213,7 +229,7 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
           dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, conflictedname);
           g_free(conflictedname);
         } else {
-          g_debug ("%p: %s", user, user->real_name);                
+          //g_debug ("%p: %s", user, user->real_name);                
           dbusmenu_menuitem_property_set (mi,
                                           USER_ITEM_PROP_NAME,
                                           user->real_name);
@@ -234,16 +250,14 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode)
                                           USER_ITEM_ICON_DEFAULT);
         }
         
-        gboolean logged_in = g_strcmp0 (user->user_name, g_get_user_name()) == 0;       
+        
+        /*g_debug ("user name = %s and g user name = %s",
+                 user->user_name,
+                 g_get_user_name());*/
+                 
         dbusmenu_menuitem_property_set_bool (mi,
                                              USER_ITEM_PROP_IS_CURRENT_USER,
-                                             logged_in);          
-        if (logged_in == TRUE){
-          g_debug ("about to set the users real name to %s for user %s",
-                    user->real_name, user->user_name);
-          session_dbus_set_users_real_name (self->session_dbus_interface, user->real_name);
-        }
-        
+                                             current_user);                  
         dbusmenu_menuitem_child_append (self->root_item, mi);
         g_signal_connect (G_OBJECT (mi),
                           DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED,
@@ -422,7 +436,7 @@ static gboolean
 check_guest_session (void)
 {
 	if (geteuid() < 500) {
-		/* System users shouldn't have guest account shown.  Mosly
+		/* System users shouldn't have guest account shown.  Mostly
 		   this would be the case of the guest user itself. */
 		return FALSE;
 	}
diff --git a/src/user-widget.c b/src/user-widget.c
index a3ad1e4..937a9eb 100644
--- a/src/user-widget.c
+++ b/src/user-widget.c
@@ -90,6 +90,10 @@ static gboolean user_widget_draw_usericon_gtk_3 (GtkWidget *widget,
 static gboolean user_widget_primitive_draw_cb (GtkWidget *image,
                                                    GdkEventExpose *event,
                                                    gpointer user_data);
+static gboolean user_widget_draw_usericon_gtk_2 (GtkWidget *widget,
+                                                 GdkEventExpose *event,
+                                                 gpointer user_data);
+                                                   
 #endif
 
 G_DEFINE_TYPE (UserWidget, user_widget, GTK_TYPE_MENU_ITEM);
@@ -174,6 +178,9 @@ user_widget_init (UserWidget *self)
   g_signal_connect_after (GTK_WIDGET(self), "expose-event", 
                           G_CALLBACK(user_widget_primitive_draw_cb),
                           GTK_WIDGET(self));  
+  g_signal_connect_after (GTK_WIDGET(priv->user_image), "expose-event", 
+                          G_CALLBACK(user_widget_draw_usericon_gtk_2),
+                          GTK_WIDGET(self));
   #endif  
 }
 
@@ -252,6 +259,23 @@ user_widget_draw_usericon_gtk_3 (GtkWidget *widget,
  */
 // GTK 2 Expose handler
 #else
+
+static gboolean
+user_widget_draw_usericon_gtk_2 (GtkWidget *widget,
+                                 GdkEventExpose *event,
+                                 gpointer user_data)
+{
+  g_return_val_if_fail(IS_USER_WIDGET(user_data), FALSE);
+  UserWidget* meta = USER_WIDGET(user_data);
+  UserWidgetPrivate * priv = USER_WIDGET_GET_PRIVATE(meta);  
+
+  if (priv->using_personal_icon == FALSE)
+    return FALSE;
+  
+  draw_album_border (widget, FALSE);  
+  return FALSE;
+}
+
 static gboolean
 user_widget_primitive_draw_cb (GtkWidget *widget,
                                GdkEventExpose *event,
@@ -273,10 +297,12 @@ user_widget_primitive_draw_cb (GtkWidget *widget,
   
   gdouble x, y;  
   style = gtk_widget_get_style (widget);
+
+  GtkAllocation allocation;
   
   gtk_widget_get_allocation (widget, &allocation);
   x = allocation.x + 13;        
-  y = allocation.height / 2;
+  y = allocation.y + allocation.height/2;
   
   cairo_arc (cr, x, y, 3.0, 0.0, 2 * G_PI);;
   
diff --git a/src/users-service-dbus.h b/src/users-service-dbus.h
index c3f0171..4dbf2a4 100644
--- a/src/users-service-dbus.h
+++ b/src/users-service-dbus.h
@@ -57,7 +57,7 @@ struct _UserData
 /* XXX - MAXIMUM_USERS should be set to 7 once we've
  *       got some gdm issues worked out.
  */
-#define MINIMUM_USERS           1
+#define MINIMUM_USERS           0
 #define MAXIMUM_USERS           7
 
 struct _UsersServiceDbus {