Merge lp:~ted/indicator-me/make-it-me into lp:indicator-me

[Ted Gould]

[Ted Gould (ted)]

Removing everything other than status. Now this is all status only. Also, quite a bit of renaming to make things clearer in the future.

=== modified file '.bzrignore'
--- .bzrignore	2009-10-08 14:45:29 +0000
+++ .bzrignore	2010-01-04 21:25:21 +0000
@@ -50,7 +50,13 @@
 src/users-service-client.h
 src/users-service-marshal.c
 src/users-service-marshal.h
-indicator-session-[0-9].[0-9].[0-9].tar.gz
-indicator-session-[0-9].[0-9].tar.gz
-indicator-session-[0-9].[0-9].[0-9].tar.gz.asc
-indicator-session-[0-9].[0-9].tar.gz.asc
+indicator-me-[0-9].[0-9].[0-9].tar.gz
+indicator-me-[0-9].[0-9].tar.gz
+indicator-me-[0-9].[0-9].[0-9].tar.gz.asc
+indicator-me-[0-9].[0-9].tar.gz.asc
+src/indicator-me-service
+src/libme.la
+src/libme_la-indicator-me.lo
+po/indicator-me.pot
+src/me-service-client.h
+src/me-service-server.h

=== modified file 'autogen.sh'
--- autogen.sh	2009-08-18 14:17:32 +0000
+++ autogen.sh	2010-01-04 21:25:21 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PKG_NAME="indicator-session"
+PKG_NAME="indicator-me"
 
 which gnome-autogen.sh || {
 	echo "You need gnome-common from GNOME SVN"

=== modified file 'configure.ac'
--- configure.ac	2009-11-04 22:14:49 +0000
+++ configure.ac	2010-01-04 21:25:21 +0000
@@ -1,10 +1,11 @@
 
-AC_INIT(src/indicator-session.c)
+AC_INIT(indicator-me, 0.0.1, [e-mail])
+AC_COPYRIGHT([Copyright 2009 Canonical])
 
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.1.7)
+AM_INIT_AUTOMAKE(indicator-me, 0.0.1)
 
 AM_MAINTAINER_MODE
 
@@ -27,7 +28,7 @@
 
 GTK_REQUIRED_VERSION=2.12
 INDICATOR_REQUIRED_VERSION=0.3.0
-DBUSMENUGTK_REQUIRED_VERSION=0.1.1
+DBUSMENUGTK_REQUIRED_VERSION=0.2.0
 POLKIT_REQUIRED_VERSION=0.92
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
@@ -37,31 +38,15 @@
 AC_SUBST(APPLET_LIBS)
 
 DBUSMENUGLIB_REQUIRED_VERSION=0.1.1
-LIBEMPATHY_REQUIRED_VERSION=2.27.0
+TELEPATHYGLIB_REQUIRED_VERSION=0.9.0
 
 PKG_CHECK_MODULES(STATUSSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION
-                                 libempathy >= $LIBEMPATHY_REQUIRED_VERSION)
+                                 indicator >= $INDICATOR_REQUIRED_VERSION
+                                 telepathy-glib >= $TELEPATHYGLIB_REQUIRED_VERSION)
 
 AC_SUBST(STATUSERVICE_CFLAGS)
 AC_SUBST(STATUSERVICE_LIBS)
 
-PKG_CHECK_MODULES(USERSSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION)
-
-AC_SUBST(USERSERVICE_CFLAGS)
-AC_SUBST(USERSERVICE_LIBS)
-
-PKG_CHECK_MODULES(SESSIONSERVICE, dbusmenu-glib >= $DBUSMENUGLIB_REQUIRED_VERSION)
-
-AC_SUBST(SESSIONERVICE_CFLAGS)
-AC_SUBST(SESSIONERVICE_LIBS)
-
-PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION
-                                   polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
-
-
-AC_SUBST(GTKLOGOUTHELPER_CFLAGS)
-AC_SUBST(GTKLOGOUTHELPER_LIBS)
-
 AC_PATH_PROG(GCONFTOOL, gconftool-2)
 dnl Specify the gconf configuration source,
 dnl default to xml::$(sysconfdir)/gconf/gconf.xml.defaults
@@ -84,7 +69,7 @@
 ###########################
 
 if test "x$with_localinstall" = "xyes"; then
-	INDICATORDIR="${libdir}/indicators/2/"
+	INDICATORDIR="${libdir}/indicators/3/"
 	INDICATORICONSDIR="${datadir}/indicator-applet/icons/"
 else
 	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator`
@@ -124,7 +109,7 @@
 # Internationalization
 ###########################
 
-GETTEXT_PACKAGE=indicator-session
+GETTEXT_PACKAGE=indicator-me
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the default get text domain])
 AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
@@ -138,26 +123,20 @@
 AC_OUTPUT([
 Makefile
 src/Makefile
-src/gtk-dialog/Makefile
 data/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
 data/icons/16x16/status/Makefile
-data/icons/16x16/actions/Makefile
 data/icons/22x22/Makefile
 data/icons/22x22/status/Makefile
-data/icons/22x22/actions/Makefile
 data/icons/24x24/Makefile
 data/icons/24x24/status/Makefile
-data/icons/24x24/actions/Makefile
 data/icons/32x32/Makefile
 data/icons/32x32/status/Makefile
-data/icons/32x32/actions/Makefile
 data/icons/48x48/Makefile
 data/icons/48x48/status/Makefile
 data/icons/scalable/Makefile
 data/icons/scalable/status/Makefile
-data/icons/scalable/actions/Makefile
 po/Makefile.in
 ])
 
@@ -167,7 +146,7 @@
 
 AC_MSG_NOTICE([
 
-SUS Indicator Configuration:
+Me Indicator Configuration:
 
 	Prefix:        $prefix
 ])

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2009-09-02 14:17:44 +0000
+++ data/Makefile.am	2010-01-04 21:25:21 +0000
@@ -1,45 +1,16 @@
 SUBDIRS = icons
 
 dbus_servicesdir = $(DBUSSERVICEDIR)
-service_in_files =  indicator-status.service.in \
-                    indicator-users.service.in \
-                    indicator-session.service.in
+service_in_files =  indicator-me.service.in
 dbus_services_DATA = $(service_in_files:.service.in=.service)
 
 %.service: %.service.in
 	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
-##############################
-# GConf Schema
-##############################
-
-schemadir =					\
-	$(GCONF_SCHEMA_FILE_DIR)
-
-schema_in_files =				\
-	indicator-session.schemas.in
-
-schema_DATA =					\
-	$(schema_in_files:.schemas.in=.schemas)
-
-@INTLTOOL_SCHEMAS_RULE@
-
-
-#$(dbus_services_DATA): $(service_in_files) Makefile
-#	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
 
 EXTRA_DIST =					\
-	$(service_in_files)			\
-	$(schema_in_files)
+	$(service_in_files)
 
 CLEANFILES =					\
-	$(dbus_services_DATA)			\
-	$(schema_DATA)
+	$(dbus_services_DATA)
 
-if GCONF_SCHEMAS_INSTALL
-install-data-local:
-	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \
-		gconftool-2 --makefile-install-rule $(schema_DATA)
-else
-install-data-local:
-endif

=== modified file 'data/icons/16x16/Makefile.am'
--- data/icons/16x16/Makefile.am	2009-08-07 19:10:15 +0000
+++ data/icons/16x16/Makefile.am	2010-01-04 21:25:21 +0000
@@ -1,1 +1,1 @@
-SUBDIRS = status actions
+SUBDIRS = status

=== removed directory 'data/icons/16x16/actions'
=== removed file 'data/icons/16x16/actions/Makefile.am'
--- data/icons/16x16/actions/Makefile.am	2009-10-06 22:51:09 +0000
+++ data/icons/16x16/actions/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/16x16/actions
-
-icons_DATA =  \
-	system-shutdown-panel.png		\
-	system-shutdown.png		\
-	system-restart.png		\
-	system-log-out.png
-
-EXTRA_DIST = $(icons_DATA)

=== removed file 'data/icons/16x16/actions/system-log-out.png'
Binary files data/icons/16x16/actions/system-log-out.png	2009-08-07 19:10:15 +0000 and data/icons/16x16/actions/system-log-out.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/16x16/actions/system-restart.png'
Binary files data/icons/16x16/actions/system-restart.png	2009-08-07 19:10:15 +0000 and data/icons/16x16/actions/system-restart.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/16x16/actions/system-shutdown-panel.png'
Binary files data/icons/16x16/actions/system-shutdown-panel.png	2009-10-06 22:51:09 +0000 and data/icons/16x16/actions/system-shutdown-panel.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/16x16/actions/system-shutdown.png'
Binary files data/icons/16x16/actions/system-shutdown.png	2009-08-07 19:10:15 +0000 and data/icons/16x16/actions/system-shutdown.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/icons/16x16/status/user-invisible.png' (properties changed: +x to -x)
=== modified file 'data/icons/22x22/Makefile.am'
--- data/icons/22x22/Makefile.am	2009-08-07 19:10:15 +0000
+++ data/icons/22x22/Makefile.am	2010-01-04 21:25:21 +0000
@@ -1,1 +1,1 @@
-SUBDIRS = status actions
+SUBDIRS = status

=== removed directory 'data/icons/22x22/actions'
=== removed file 'data/icons/22x22/actions/Makefile.am'
--- data/icons/22x22/actions/Makefile.am	2009-10-06 22:51:09 +0000
+++ data/icons/22x22/actions/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/22x22/actions
-
-icons_DATA =  \
-	system-shutdown-panel.png		\
-	system-shutdown.png		\
-	system-restart.png		\
-	system-log-out.png
-
-EXTRA_DIST = $(icons_DATA)

=== removed file 'data/icons/22x22/actions/system-log-out.png'
Binary files data/icons/22x22/actions/system-log-out.png	2009-08-07 19:10:15 +0000 and data/icons/22x22/actions/system-log-out.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/22x22/actions/system-restart.png'
Binary files data/icons/22x22/actions/system-restart.png	2009-08-07 19:10:15 +0000 and data/icons/22x22/actions/system-restart.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/22x22/actions/system-shutdown-panel.png'
Binary files data/icons/22x22/actions/system-shutdown-panel.png	2009-10-06 22:51:09 +0000 and data/icons/22x22/actions/system-shutdown-panel.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/22x22/actions/system-shutdown.png'
Binary files data/icons/22x22/actions/system-shutdown.png	2009-08-07 19:10:15 +0000 and data/icons/22x22/actions/system-shutdown.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/icons/22x22/status/user-invisible.png' (properties changed: +x to -x)
=== modified file 'data/icons/24x24/Makefile.am'
--- data/icons/24x24/Makefile.am	2009-08-07 19:10:15 +0000
+++ data/icons/24x24/Makefile.am	2010-01-04 21:25:21 +0000
@@ -1,1 +1,1 @@
-SUBDIRS = status actions
+SUBDIRS = status

=== removed directory 'data/icons/24x24/actions'
=== removed file 'data/icons/24x24/actions/Makefile.am'
--- data/icons/24x24/actions/Makefile.am	2009-10-06 22:51:09 +0000
+++ data/icons/24x24/actions/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/24x24/actions
-
-icons_DATA =  \
-	system-shutdown-panel.png		\
-	system-shutdown.png		\
-	system-restart.png		\
-	system-log-out.png
-
-EXTRA_DIST = $(icons_DATA)

=== removed file 'data/icons/24x24/actions/system-log-out.png'
Binary files data/icons/24x24/actions/system-log-out.png	2009-08-07 19:10:15 +0000 and data/icons/24x24/actions/system-log-out.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/24x24/actions/system-restart.png'
Binary files data/icons/24x24/actions/system-restart.png	2009-08-07 19:10:15 +0000 and data/icons/24x24/actions/system-restart.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/24x24/actions/system-shutdown-panel.png'
Binary files data/icons/24x24/actions/system-shutdown-panel.png	2009-10-06 22:51:09 +0000 and data/icons/24x24/actions/system-shutdown-panel.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/24x24/actions/system-shutdown.png'
Binary files data/icons/24x24/actions/system-shutdown.png	2009-08-07 19:10:15 +0000 and data/icons/24x24/actions/system-shutdown.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/icons/24x24/status/user-invisible.png' (properties changed: +x to -x)
=== modified file 'data/icons/32x32/Makefile.am'
--- data/icons/32x32/Makefile.am	2009-08-07 19:10:15 +0000
+++ data/icons/32x32/Makefile.am	2010-01-04 21:25:21 +0000
@@ -1,1 +1,1 @@
-SUBDIRS = status actions
+SUBDIRS = status

=== removed directory 'data/icons/32x32/actions'
=== removed file 'data/icons/32x32/actions/Makefile.am'
--- data/icons/32x32/actions/Makefile.am	2009-08-13 04:47:41 +0000
+++ data/icons/32x32/actions/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/32x32/actions
-
-icons_DATA =  \
-	system-restart.png		\
-	system-log-out.png
-
-EXTRA_DIST = $(icons_DATA)

=== removed file 'data/icons/32x32/actions/system-log-out.png'
Binary files data/icons/32x32/actions/system-log-out.png	2009-08-07 19:10:15 +0000 and data/icons/32x32/actions/system-log-out.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'data/icons/32x32/actions/system-restart.png'
Binary files data/icons/32x32/actions/system-restart.png	2009-08-07 19:10:15 +0000 and data/icons/32x32/actions/system-restart.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/icons/32x32/status/user-invisible.png' (properties changed: +x to -x)
=== modified file 'data/icons/48x48/status/user-invisible.png' (properties changed: +x to -x)
=== modified file 'data/icons/scalable/Makefile.am'
--- data/icons/scalable/Makefile.am	2009-08-07 19:10:15 +0000
+++ data/icons/scalable/Makefile.am	2010-01-04 21:25:21 +0000
@@ -1,1 +1,1 @@
-SUBDIRS = status actions
+SUBDIRS = status

=== removed directory 'data/icons/scalable/actions'
=== removed file 'data/icons/scalable/actions/Makefile.am'
--- data/icons/scalable/actions/Makefile.am	2009-10-06 22:51:09 +0000
+++ data/icons/scalable/actions/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-
-iconsdir = $(INDICATORICONSDIR)/hicolor/scalable/actions
-
-icons_DATA =  \
-	system-shutdown-panel.svg \
-	system-restart.svg \
-	system-log-out.svg \
-	system-shutdown.svg
-
-EXTRA_DIST = $(icons_DATA)

=== removed file 'data/icons/scalable/actions/system-log-out.svg'
--- data/icons/scalable/actions/system-log-out.svg	2009-08-07 19:10:15 +0000
+++ data/icons/scalable/actions/system-log-out.svg	1970-01-01 00:00:00 +0000
@@ -1,284 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg5157"
-   sodipodi:version="0.32"
-   inkscape:version="0.45"
-   version="1.0"
-   sodipodi:docname="system-log-out.svg"
-   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs5159">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7130">
-      <stop
-         style="stop-color:#4e9a06;stop-opacity:1"
-         offset="0"
-         id="stop7132" />
-      <stop
-         style="stop-color:#73d216;stop-opacity:1"
-         offset="1"
-         id="stop7134" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7121">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7123" />
-      <stop
-         style="stop-color:#8ae234;stop-opacity:1"
-         offset="1"
-         id="stop7125" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient6998"
-       inkscape:collect="always">
-      <stop
-         id="stop7000"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop7002"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7130"
-       id="linearGradient7145"
-       gradientUnits="userSpaceOnUse"
-       x1="11.5"
-       y1="68.75"
-       x2="-13.247213"
-       y2="21.843145" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7121"
-       id="linearGradient7147"
-       gradientUnits="userSpaceOnUse"
-       x1="-33.040741"
-       y1="10.966461"
-       x2="-30.919424"
-       y2="17.448257" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6998"
-       id="radialGradient7161"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.3222749,0,20.728756)"
-       cx="19.688505"
-       cy="30.585787"
-       fx="19.688505"
-       fy="30.585787"
-       r="4.6624851" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6998"
-       id="radialGradient7163"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.3222749,0,20.728756)"
-       cx="19.688505"
-       cy="30.585787"
-       fx="19.688505"
-       fy="30.585787"
-       r="4.6624851" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     gridtolerance="10000"
-     guidetolerance="10"
-     objecttolerance="10"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="197.95843"
-     inkscape:cy="28.49025"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer2"
-     width="48px"
-     height="48px"
-     inkscape:window-width="872"
-     inkscape:window-height="624"
-     inkscape:window-x="684"
-     inkscape:window-y="208"
-     showborder="false"
-     inkscape:showpageshadow="false"
-     showgrid="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     gridspacingx="0.5px"
-     gridspacingy="0.5px"
-     gridempspacing="2"
-     inkscape:grid-points="true" />
-  <metadata
-     id="metadata5162">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>System-log-out</dc:title>
-        <dc:date>2007-08-27</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Lapo Calamandrei</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Kalle Persson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>logout</rdf:li>
-            <rdf:li>exit</rdf:li>
-            <rdf:li>man</rdf:li>
-            <rdf:li>sign</rdf:li>
-            <rdf:li>running</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="shadow"
-     inkscape:groupmode="layer"
-     id="layer1"
-     style="display:inline">
-    <g
-       id="g6227"
-       transform="matrix(0.6759778,0,0,0.8422279,-72.059226,25.879981)"
-       style="opacity:0.33000004" />
-    <g
-       id="g7008"
-       style="opacity:0.5"
-       transform="matrix(1.2209709,0,0,1.465165,4.32932,-3.7089664)">
-      <path
-         transform="matrix(1.356682,0,0,1.1785115,-7.0105312,-5.8165354)"
-         d="M 24.35099 30.585787 A 4.6624851 1.5026019 0 1 1  15.02602,30.585787 A 4.6624851 1.5026019 0 1 1  24.35099 30.585787 z"
-         sodipodi:ry="1.5026019"
-         sodipodi:rx="4.6624851"
-         sodipodi:cy="30.585787"
-         sodipodi:cx="19.688505"
-         id="path6984"
-         style="opacity:0.5;fill:url(#radialGradient7161);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <path
-         transform="matrix(3.7061179,0,0,1.3310245,-58.247641,-11.710432)"
-         d="M 24.35099 30.585787 A 4.6624851 1.5026019 0 1 1  15.02602,30.585787 A 4.6624851 1.5026019 0 1 1  24.35099 30.585787 z"
-         sodipodi:ry="1.5026019"
-         sodipodi:rx="4.6624851"
-         sodipodi:cy="30.585787"
-         sodipodi:cx="19.688505"
-         id="path6986"
-         style="opacity:0.25;fill:url(#radialGradient7163);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0.69999992;stroke-opacity:1"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="omino">
-    <g
-       id="g7138"
-       transform="translate(40,0)">
-      <g
-         id="g7094">
-        <path
-           id="path5955"
-           d="M -7.5,5.5 C -9.708,5.5 -11.5,7.292 -11.5,9.5 C -11.5,11.708 -9.7080001,13.5 -7.5,13.5 C -5.292,13.5 -3.5000001,11.708 -3.5,9.5 C -3.5,7.292 -5.2920001,5.5 -7.5,5.5 z M -20.6875,11.5 C -21.228728,11.552698 -21.725172,11.823486 -22.0625,12.25 L -26.0625,17.25 C -26.752856,18.112945 -26.612945,19.372144 -25.75,20.0625 C -24.887055,20.752856 -23.627856,20.612945 -22.9375,19.75 L -19.53125,15.5 L -15.75,15.5 L -22.1875,23.3125 C -22.420945,23.645583 -22.50685,24.06221 -22.5,24.5 L -22.5,31.5 L -30.5,31.5 L -30.5,35.5 L -20.5,35.5 C -19.395476,35.49989 -18.50011,34.604524 -18.5,33.5 L -18.5,27.3125 L -13.5,32.3125 L -13.5,40.5 L -9.5,40.5 L -9.5,31.5 L -9.5,30.65625 L -10.09375,30.09375 L -14.84375,25.34375 L -11.5,21.28125 L -11.5,22.5 C -11.49989,23.604524 -10.604524,24.49989 -9.5,24.5 L -2.5,24.5 C -1.778728,24.510201 -1.113613,24.122995 -0.75,23.5 C -0.386387,22.877006 -0.386387,22.122995 -0.75,21.5 C -1.113613,20.877004 -1.778728,20.489799 -2.5,20.5 L -7.5,20.5 L -7.5,16 C -10.390638,16 -12.843604,14.110886 -13.6875,11.5 L -20.5,11.5 C -20.562466,11.497069 -20.625034,11.497069 -20.6875,11.5 z "
-           style="opacity:1;fill:url(#linearGradient7145);fill-opacity:1;fill-rule:evenodd;stroke:#4e9a06;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      </g>
-      <path
-         d="M -20.625,12.5 C -20.883516,12.532601 -21.119099,12.669978 -21.28125,12.875 L -25.28125,17.875 C -25.632167,18.313646 -25.563646,18.930333 -25.125,19.28125 C -24.686354,19.632167 -24.069667,19.563646 -23.71875,19.125 L -20.3125,14.875 C -20.122073,14.638438 -19.834933,14.500611 -19.53125,14.5 L -15.75,14.5 C -15.36741,14.504084 -15.020291,14.724946 -14.854508,15.069775 C -14.688724,15.414605 -14.733008,15.823641 -14.96875,16.125 L -21.375,23.875 C -21.378721,23.880309 -21.37135,23.900494 -21.375,23.90625 L -21.40625,23.9375 C -21.46879,24.048638 -21.50412,24.205427 -21.5,24.46875 C -21.499838,24.479166 -21.499838,24.489584 -21.5,24.5 L -21.5,31.5 C -21.503016,32.051031 -21.948969,32.496984 -22.5,32.5 L -29.5,32.5 L -29.5,34.5 L -20.5,34.5 C -19.938773,34.499944 -19.500056,34.061227 -19.5,33.5 L -19.5,27.3125 C -19.504078,26.903415 -19.259899,26.532643 -18.882467,26.374807 C -18.505035,26.216972 -18.069603,26.303544 -17.78125,26.59375 L -12.78125,31.59375 C -12.595622,31.786381 -12.494406,32.045043 -12.5,32.3125 L -12.5,39.5 L -10.5,39.5 L -10.5,31.5 L -10.5,31.09375 L -10.78125,30.8125 C -10.791666,30.812662 -10.802084,30.812662 -10.8125,30.8125 L -15.5625,26.0625 C -15.923992,25.696513 -15.95096,25.116711 -15.625,24.71875 L -12.28125,20.65625 C -12.013038,20.330928 -11.570348,20.207488 -11.172497,20.347084 C -10.774646,20.486681 -10.506139,20.859664 -10.5,21.28125 L -10.5,22.5 C -10.499944,23.061227 -10.061227,23.499944 -9.5,23.5 L -2.5,23.5 C -2.1471898,23.50499 -1.8109749,23.318639 -1.625,23 C -1.439414,22.682027 -1.4394134,22.317974 -1.625,22 C -1.8109749,21.68136 -2.1471889,21.49501 -2.5,21.5 L -7.5,21.5 C -8.0510308,21.496984 -8.4969843,21.051031 -8.5,20.5 L -8.5,16.84375 C -11.109944,16.483168 -13.278833,14.83457 -14.3125,12.5 L -20.5,12.5 C -20.520828,12.500648 -20.541672,12.500648 -20.5625,12.5 C -20.578034,12.499271 -20.578204,12.5 -20.59375,12.5 C -20.609296,12.5 -20.609466,12.499271 -20.625,12.5 z "
-         id="path7104"
-         style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#8ae234;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
-         inkscape:original="M -20.6875 11.5 C -21.228728 11.552698 -21.725172 11.823486 -22.0625 12.25 L -26.0625 17.25 C -26.752856 18.112945 -26.612945 19.372144 -25.75 20.0625 C -24.887055 20.752856 -23.627856 20.612945 -22.9375 19.75 L -19.53125 15.5 L -15.75 15.5 L -22.1875 23.3125 C -22.420945 23.645583 -22.50685 24.06221 -22.5 24.5 L -22.5 31.5 L -30.5 31.5 L -30.5 35.5 L -20.5 35.5 C -19.395476 35.49989 -18.50011 34.604524 -18.5 33.5 L -18.5 27.3125 L -13.5 32.3125 L -13.5 40.5 L -9.5 40.5 L -9.5 31.5 L -9.5 30.65625 L -10.09375 30.09375 L -14.84375 25.34375 L -11.5 21.28125 L -11.5 22.5 C -11.49989 23.604524 -10.604524 24.49989 -9.5 24.5 L -2.5 24.5 C -1.778728 24.510201 -1.113613 24.122995 -0.75 23.5 C -0.386387 22.877006 -0.386387 22.122995 -0.75 21.5 C -1.113613 20.877004 -1.778728 20.489799 -2.5 20.5 L -7.5 20.5 L -7.5 16 C -10.390638 16 -12.843604 14.110886 -13.6875 11.5 L -20.5 11.5 C -20.562466 11.497069 -20.625034 11.497069 -20.6875 11.5 z "
-         inkscape:radius="-1.0054175"
-         sodipodi:type="inkscape:offset" />
-      <path
-         sodipodi:nodetypes="cccccccsscccscccccccccccccsccccc"
-         id="path7106"
-         d="M -1.625,22 C -1.810975,21.68136 -2.147189,21.49501 -2.5,21.5 L -7.5,21.5 C -8.051031,21.496984 -8.496984,21.051031 -8.5,20.5 L -8.5,16.84375 C -11.109944,16.483168 -13.278833,14.83457 -14.3125,12.5 L -20.5,12.5 C -20.520828,12.500648 -20.541672,12.500648 -20.5625,12.5 C -20.578034,12.499271 -20.578204,12.5 -20.59375,12.5 C -20.609296,12.5 -20.609466,12.499271 -20.625,12.5 C -20.883516,12.532601 -21.119099,12.669978 -21.28125,12.875 L -25.28125,17.875 C -25.632167,18.313646 -25.563646,18.930333 -25.125,19.28125 M -10.5,31.5 L -10.5,31.09375 L -10.78125,30.8125 C -10.791666,30.812662 -10.802084,30.812662 -10.8125,30.8125 L -15.5625,26.0625 C -15.923992,25.696513 -15.95096,25.116711 -15.625,24.71875 M -12.5,32.3125 L -12.5,39.5 M -14.854508,15.069775 C -14.688724,15.414605 -14.733008,15.823641 -14.96875,16.125 L -21.375,23.875 C -21.378721,23.880309 -21.37135,23.900494 -21.375,23.90625 L -21.40625,23.9375 C -21.46879,24.048638 -21.50412,24.205427 -21.5,24.46875 C -21.499838,24.479166 -21.499838,24.489584 -21.5,24.5 L -21.5,31.5 C -21.503016,32.051031 -21.948969,32.496984 -22.5,32.5 L -29.5,32.5 L -29.5,34.5"
-         style="opacity:0.3;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline" />
-      <path
-         inkscape:export-ydpi="90"
-         inkscape:export-xdpi="90"
-         inkscape:export-filename="/home/kalle/Desktop/system-log-out.png"
-         sodipodi:type="arc"
-         style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient7147);stroke-width:0.6666649;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path7119"
-         sodipodi:cx="-31.5"
-         sodipodi:cy="16"
-         sodipodi:rx="2"
-         sodipodi:ry="2"
-         d="M -29.5 16 A 2 2 0 1 1  -33.5,16 A 2 2 0 1 1  -29.5 16 z"
-         transform="matrix(1.500004,0,0,1.500004,39.750134,-14.500064)" />
-    </g>
-    <g
-       id="g7055"
-       transform="translate(130,0)">
-      <path
-         sodipodi:nodetypes="ccc"
-         id="path7045"
-         d="M -28.5,33.5 L -20.5,33.5 L -20.5,24.5"
-         style="opacity:0.4089219;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline" />
-      <path
-         sodipodi:nodetypes="ccc"
-         id="path7047"
-         d="M -24.5,18.5 L -20.5,13.5 L -11.5,13.5"
-         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         id="path7049"
-         d="M -2.5,22.5 L -9.5,22.5 L -9.5,13.5"
-         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         id="path7051"
-         d="M -11.5,38.5 L -11.5,31.5 L -18.5,24.5"
-         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="cc"
-         id="path7053"
-         d="M -10,14 L -19.5,25.5"
-         style="opacity:0.5;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:7;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
-</svg>

=== removed file 'data/icons/scalable/actions/system-restart.svg'
--- data/icons/scalable/actions/system-restart.svg	2009-08-07 19:10:15 +0000
+++ data/icons/scalable/actions/system-restart.svg	1970-01-01 00:00:00 +0000
@@ -1,397 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:export-ydpi="90.000000"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-filename="c:\Tango\git\view-refresh.png"
-   width="48"
-   height="48"
-   id="svg11300"
-   sodipodi:version="0.32"
-   inkscape:version="0.45"
-   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/actions"
-   sodipodi:docname="view-refresh.svg"
-   version="1.0"
-   inkscape:r_cx="true"
-   inkscape:r_cy="true"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5335">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop5337" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop5339" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5313">
-      <stop
-         id="stop5315"
-         offset="0"
-         style="stop-color:#99b8df;stop-opacity:1" />
-      <stop
-         style="stop-color:#3969a8;stop-opacity:1;"
-         offset="0.23705086"
-         id="stop5333" />
-      <stop
-         style="stop-color:#4f7eba;stop-opacity:1;"
-         offset="0.54706067"
-         id="stop5317" />
-      <stop
-         id="stop5321"
-         offset="0.74557692"
-         style="stop-color:#96b6d7;stop-opacity:1" />
-      <stop
-         style="stop-color:#a0bddc;stop-opacity:1"
-         offset="0.87321436"
-         id="stop5331" />
-      <stop
-         id="stop5319"
-         offset="1"
-         style="stop-color:#729fcf;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8152">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop8154" />
-      <stop
-         id="stop3174"
-         offset="0.5"
-         style="stop-color:#4f7eba;stop-opacity:1;" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="1"
-         id="stop8156" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3207">
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0.47058824;"
-         offset="0"
-         id="stop3209" />
-      <stop
-         style="stop-color:#eeeeec;stop-opacity:0;"
-         offset="1"
-         id="stop3211" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0818662,0,0,1.1166851,-0.8207482,-1.8622434)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0818662,0,0,-1.1166851,50.09459,49.644854)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.40255"
-       y2="26.800913" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.536723,0,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8152"
-       id="linearGradient8158"
-       x1="49.412277"
-       y1="37.904068"
-       x2="11.881318"
-       y2="19.776045"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient8170"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.0818662,0,0,-1.1166851,48.639854,47.862243)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient8172"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.0818662,0,0,1.1166851,-2.2754847,-3.644854)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.40255"
-       y2="26.800913" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8152"
-       id="linearGradient8174"
-       gradientUnits="userSpaceOnUse"
-       x1="49.412277"
-       y1="37.904068"
-       x2="11.881318"
-       y2="19.776045" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3207"
-       id="linearGradient8178"
-       gradientUnits="userSpaceOnUse"
-       x1="5.8925977"
-       y1="20.540676"
-       x2="45.198921"
-       y2="27.721035" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5313"
-       id="linearGradient8180"
-       gradientUnits="userSpaceOnUse"
-       x1="61.572533"
-       y1="28.049652"
-       x2="10.969182"
-       y2="20.333939" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5335"
-       id="linearGradient5341"
-       x1="8.6878577"
-       y1="25.265626"
-       x2="52.122673"
-       y2="25.265626"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     stroke="#3465a4"
-     fill="#729fcf"
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#e8e8e8"
-     borderopacity="0.86666667"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="48.628749"
-     inkscape:cy="21.704614"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:showpageshadow="false"
-     inkscape:window-width="892"
-     inkscape:window-height="938"
-     inkscape:window-x="374"
-     inkscape:window-y="37"
-     width="48px"
-     height="48px"
-     borderlayer="true" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-        <dc:title>View Refresh</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>reload</rdf:li>
-            <rdf:li>refresh</rdf:li>
-            <rdf:li>view</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Ricardo 'Rick' González</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     inkscape:r_cx="true"
-     inkscape:r_cy="true">
-    <path
-       transform="matrix(-1.5146484,0,0,-0.7917058,60.923237,69.528413)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.36111109;color:#000000;fill:url(#radialGradient1503);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true" />
-    <path
-       style="color:#000000;fill:url(#linearGradient1486);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1488);stroke-width:1.04300582000000008;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;opacity:0.51807229"
-       d="M 20.478497,9.7711467 C 20.478497,9.7711467 12.632988,7.9438002 14.368023,21.024298 L 5.1028658,21.024298 C 5.1028658,21.024298 6.0085332,7.5377773 20.478497,9.7711467 z "
-       id="path2865"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       sodipodi:nodetypes="cccc" />
-    <g
-       id="g1878"
-       transform="matrix(-0.6129282,-0.5154381,-0.5178496,0.610074,58.686164,13.911361)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       style="fill:url(#linearGradient8158);fill-opacity:1;stroke:#204a87;stroke-width:1.24932528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         sodipodi:nodetypes="ccccccc"
-         id="path1880"
-         d="M 45.862102,50.273522 C 62.924432,34.96305 47.150241,15.929711 22.760624,12.513943 L 22.113577,3.1522143 L 7.613534,20.510135 L 22.703188,33.23244 C 22.703188,33.23244 22.454828,23.347105 22.454828,23.347105 C 41.289895,24.339584 54.775794,35.675041 45.862102,50.273522 z "
-         style="opacity:1;color:#000000;fill:url(#linearGradient8180);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.24977946000000006;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         inkscape:r_cx="true"
-         inkscape:r_cy="true" />
-    </g>
-    <g
-       style="fill:none;fill-opacity:1;stroke:url(#linearGradient5341);stroke-width:1.24928653000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;opacity:0.54819277"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       transform="matrix(-0.612811,-0.5154406,-0.5177506,0.6100769,58.675633,13.911365)"
-       id="g3185">
-      <path
-         sodipodi:type="inkscape:offset"
-         inkscape:radius="-1.197237"
-         inkscape:original="M 22.125 3.15625 L 7.625 20.5 L 22.71875 33.21875 C 22.718749 33.21875 22.46875 23.34375 22.46875 23.34375 C 41.298509 24.342727 54.468144 35.661007 45.5625 50.25 C 62.614067 34.952315 46.852277 15.923275 22.46875 12.5 L 22.125 3.15625 z "
-         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient5341);stroke-width:1.24928653000000001;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-         id="path3189"
-         d="M 21.0625,6.3125 L 9.3125,20.34375 L 21.46875,30.59375 C 21.39688,27.754893 21.28125,23.375 21.28125,23.375 C 21.27502,23.044409 21.405774,22.725958 21.642519,22.495132 C 21.879264,22.264306 22.200923,22.141654 22.53125,22.15625 C 32.170255,22.667629 40.441027,25.773015 45.28125,30.875 C 48.676469,34.453835 50.102049,39.131532 49.125,44.21875 C 50.368339,42.205641 51.107893,40.194594 51.375,38.21875 C 51.870422,34.55401 50.856988,30.946652 48.5625,27.59375 C 43.973525,20.887947 34.236978,15.361613 22.3125,13.6875 C 21.732114,13.606381 21.295727,13.117098 21.28125,12.53125 L 21.0625,6.3125 z "
-         transform="translate(1.0080026e-6,8.5223784e-7)" />
-    </g>
-    <g
-       id="g2424"
-       transform="matrix(0.190868,0.16126,0.16126,-0.190868,-0.719083,15.30613)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccc"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       id="path8160"
-       d="M 27.340608,36.228853 C 27.340608,36.228853 35.186117,38.0562 33.451082,24.975702 L 42.71624,24.975702 C 42.71624,24.975702 41.810572,38.462223 27.340608,36.228853 z "
-       style="color:#000000;fill:url(#linearGradient8170);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8172);stroke-width:1.04300582000000008;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;opacity:0.51807229" />
-    <g
-       style="fill:url(#linearGradient8174);fill-opacity:1;stroke:#204a87;stroke-width:1.24932528;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:r_cy="true"
-       inkscape:r_cx="true"
-       transform="matrix(0.6101332,0.5154999,0.5154881,-0.6101471,-10.618024,32.088556)"
-       id="g8162">
-      <path
-         inkscape:r_cy="true"
-         inkscape:r_cx="true"
-         style="opacity:1;color:#000000;fill:url(#linearGradient8180);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1.25256376;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible;enable-background:accumulate"
-         d="M 45.862102,50.273522 C 62.924432,34.96305 47.150241,15.929711 22.760624,12.513943 L 22.113577,3.1522141 L 7.6135337,20.510135 L 22.703188,33.23244 C 22.703188,33.23244 22.454828,23.347105 22.454828,23.347105 C 41.289895,24.339584 54.775794,35.675041 45.862102,50.273522 z "
-         id="path8164"
-         sodipodi:nodetypes="ccccccc" />
-    </g>
-    <g
-       id="g8166"
-       transform="matrix(0.6128107,0.5154406,0.5177504,-0.6100769,-10.856505,32.088635)"
-       inkscape:r_cx="true"
-       inkscape:r_cy="true"
-       style="fill:none;fill-opacity:1;stroke:#204a87;stroke-width:1.24928653;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1">
-      <path
-         transform="matrix(0.9972307,-2.4605589e-3,-2.4605593e-3,0.9980642,0.2457029,0.2077351)"
-         d="M 21.0625,6.3125 L 9.3125,20.34375 L 21.46875,30.59375 C 21.39688,27.754893 21.28125,23.375 21.28125,23.375 C 21.27502,23.044409 21.405774,22.725958 21.642519,22.495132 C 21.879264,22.264306 22.200923,22.141654 22.53125,22.15625 C 32.170255,22.667629 40.441027,25.773015 45.28125,30.875 C 48.676469,34.453835 50.102049,39.131532 49.125,44.21875 C 50.368339,42.205641 51.107893,40.194594 51.375,38.21875 C 51.870422,34.55401 50.856988,30.946652 48.5625,27.59375 C 43.973525,20.887947 34.236978,15.361613 22.3125,13.6875 C 21.732114,13.606381 21.295727,13.117098 21.28125,12.53125 L 21.0625,6.3125 z "
-         id="path8168"
-         style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient8178);stroke-width:1.24973191;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.70588235;visibility:visible;display:block;overflow:visible"
-         inkscape:original="M 22.125 3.15625 L 7.625 20.5 L 22.71875 33.21875 C 22.718749 33.21875 22.46875 23.34375 22.46875 23.34375 C 41.298509 24.342727 54.468144 35.661007 45.5625 50.25 C 62.614067 34.952315 46.852277 15.923275 22.46875 12.5 L 22.125 3.15625 z "
-         inkscape:radius="-1.197237"
-         sodipodi:type="inkscape:offset" />
-    </g>
-  </g>
-</svg>

=== removed file 'data/icons/scalable/actions/system-shutdown-panel.svg'
--- data/icons/scalable/actions/system-shutdown-panel.svg	2009-10-06 22:51:09 +0000
+++ data/icons/scalable/actions/system-shutdown-panel.svg	1970-01-01 00:00:00 +0000
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="gnome-shutdown.svg"
-   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/apps"
-   inkscape:version="0.45"
-   sodipodi:version="0.32"
-   id="svg11142"
-   height="48"
-   width="48"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4749">
-      <stop
-         id="stop4751"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0000000;"
-         offset="0.50000000"
-         id="stop4757" />
-      <stop
-         id="stop4753"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11264"
-       inkscape:collect="always">
-      <stop
-         id="stop11266"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop11268"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11178">
-      <stop
-         style="stop-color:#d1d1cc;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11180" />
-      <stop
-         id="stop4735"
-         offset="0.50000000"
-         style="stop-color:#d1d1d1;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11188" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11164">
-      <stop
-         id="stop11166"
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6c6bf;stop-opacity:1.0000000;"
-         offset="0.26988637"
-         id="stop11172" />
-      <stop
-         id="stop11176"
-         offset="0.37900311"
-         style="stop-color:#f9f9f8;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11174"
-         offset="0.75000000"
-         style="stop-color:#c8c8c2;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11168"
-         offset="1.0000000"
-         style="stop-color:#eeeeec;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="23.071428"
-       x2="42.471249"
-       y1="23.071428"
-       x1="7.1433797"
-       id="linearGradient11170"
-       xlink:href="#linearGradient11164"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(1.364252,-9.115392e-17,9.115392e-17,1.364252,-9.47947,-5.618016)"
-       gradientUnits="userSpaceOnUse"
-       r="18.672388"
-       fy="17.224812"
-       fx="24.673435"
-       cy="17.224812"
-       cx="24.673435"
-       id="radialGradient11234"
-       xlink:href="#linearGradient11178"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="18.214285"
-       fy="23.071428"
-       fx="25.785715"
-       cy="23.071428"
-       cx="25.785715"
-       id="radialGradient11270"
-       xlink:href="#linearGradient11264"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="8.5882788"
-       x2="25.785715"
-       y1="21.978363"
-       x1="25.785715"
-       id="linearGradient4755"
-       xlink:href="#linearGradient4749"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="423"
-     inkscape:window-x="840"
-     inkscape:window-height="606"
-     inkscape:window-width="750"
-     stroke="#555753"
-     fill="#edd400"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="-10.815272"
-     inkscape:cx="85.353158"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.32941176"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Shutdown</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>lock</rdf:li>
-            <rdf:li>key</rdf:li>
-            <rdf:li>secure</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:url(#radialGradient11270);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8505457;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path11262"
-       sodipodi:cx="25.785715"
-       sodipodi:cy="23.071428"
-       sodipodi:rx="18.214285"
-       sodipodi:ry="18.214285"
-       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
-       transform="matrix(1.269833,0,0,1.269833,-9.24356,-4.225444)" />
-    <path
-       transform="matrix(1.175715,0,0,1.175715,-6.816669,-3.911156)"
-       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
-       sodipodi:ry="18.214285"
-       sodipodi:rx="18.214285"
-       sodipodi:cy="23.071428"
-       sodipodi:cx="25.785715"
-       id="path11152"
-       style="opacity:1;color:#000000;fill:url(#linearGradient11170);fill-opacity:1;fill-rule:evenodd;stroke:#74796e;stroke-width:0.8505457;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:url(#radialGradient11234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93590021;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path11154"
-       sodipodi:cx="25.785715"
-       sodipodi:cy="23.071428"
-       sodipodi:rx="18.214285"
-       sodipodi:ry="18.214285"
-       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
-       transform="matrix(1.06849,0,0,1.06849,-4.051771,-2.437299)" />
-    <path
-       sodipodi:nodetypes="czs"
-       id="path4743"
-       d="M 19.1468,14.674063 C 12.154448,18.486901 15.316371,29.412893 23.310313,29.412893 C 31.220984,29.412893 34.766419,19.054547 27.473824,14.674063"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       id="path4745"
-       d="M 23.364832,19.364034 L 23.364832,11.95091"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:2.99999905;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       transform="matrix(1.04555,0,0,1.04555,-3.460245,-1.908039)"
-       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
-       sodipodi:ry="18.214285"
-       sodipodi:rx="18.214285"
-       sodipodi:cy="23.071428"
-       sodipodi:cx="25.785715"
-       id="path4747"
-       style="opacity:0.88235294;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4755);stroke-width:0.95643449;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-  </g>
-</svg>

=== removed file 'data/icons/scalable/actions/system-shutdown.svg'
--- data/icons/scalable/actions/system-shutdown.svg	2009-08-07 19:10:15 +0000
+++ data/icons/scalable/actions/system-shutdown.svg	1970-01-01 00:00:00 +0000
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="gnome-shutdown.svg"
-   sodipodi:docbase="/home/dobey/Projects/gnome-icon-theme/scalable/apps"
-   inkscape:version="0.45"
-   sodipodi:version="0.32"
-   id="svg11142"
-   height="48"
-   width="48"
-   version="1.0"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient4749">
-      <stop
-         id="stop4751"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.0000000;"
-         offset="0.50000000"
-         id="stop4757" />
-      <stop
-         id="stop4753"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11264"
-       inkscape:collect="always">
-      <stop
-         id="stop11266"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop11268"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11178">
-      <stop
-         style="stop-color:#d1d1cc;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop11180" />
-      <stop
-         id="stop4735"
-         offset="0.50000000"
-         style="stop-color:#d1d1d1;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#b9b9b9;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop11188" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient11164">
-      <stop
-         id="stop11166"
-         offset="0"
-         style="stop-color:#eeeeec;stop-opacity:1;" />
-      <stop
-         style="stop-color:#c6c6bf;stop-opacity:1.0000000;"
-         offset="0.26988637"
-         id="stop11172" />
-      <stop
-         id="stop11176"
-         offset="0.37900311"
-         style="stop-color:#f9f9f8;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11174"
-         offset="0.75000000"
-         style="stop-color:#c8c8c2;stop-opacity:1.0000000;" />
-      <stop
-         id="stop11168"
-         offset="1.0000000"
-         style="stop-color:#eeeeec;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="23.071428"
-       x2="42.471249"
-       y1="23.071428"
-       x1="7.1433797"
-       id="linearGradient11170"
-       xlink:href="#linearGradient11164"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientTransform="matrix(1.364252,-9.115392e-17,9.115392e-17,1.364252,-9.47947,-5.618016)"
-       gradientUnits="userSpaceOnUse"
-       r="18.672388"
-       fy="17.224812"
-       fx="24.673435"
-       cy="17.224812"
-       cx="24.673435"
-       id="radialGradient11234"
-       xlink:href="#linearGradient11178"
-       inkscape:collect="always" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       r="18.214285"
-       fy="23.071428"
-       fx="25.785715"
-       cy="23.071428"
-       cx="25.785715"
-       id="radialGradient11270"
-       xlink:href="#linearGradient11264"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="8.5882788"
-       x2="25.785715"
-       y1="21.978363"
-       x1="25.785715"
-       id="linearGradient4755"
-       xlink:href="#linearGradient4749"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="423"
-     inkscape:window-x="840"
-     inkscape:window-height="606"
-     inkscape:window-width="750"
-     stroke="#555753"
-     fill="#edd400"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="-10.815272"
-     inkscape:cx="85.353158"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.32941176"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showguides="true"
-     inkscape:guide-bbox="true" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Shutdown</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>lock</rdf:li>
-            <rdf:li>key</rdf:li>
-            <rdf:li>secure</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Reproduction" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/Distribution" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/Notice" />
-        <cc:permits
-           rdf:resource="http://web.resource.org/cc/DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/ShareAlike" />
-        <cc:requires
-           rdf:resource="http://web.resource.org/cc/SourceCode" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:url(#radialGradient11270);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8505457;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path11262"
-       sodipodi:cx="25.785715"
-       sodipodi:cy="23.071428"
-       sodipodi:rx="18.214285"
-       sodipodi:ry="18.214285"
-       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
-       transform="matrix(1.269833,0,0,1.269833,-9.24356,-4.225444)" />
-    <path
-       transform="matrix(1.175715,0,0,1.175715,-6.816669,-3.911156)"
-       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
-       sodipodi:ry="18.214285"
-       sodipodi:rx="18.214285"
-       sodipodi:cy="23.071428"
-       sodipodi:cx="25.785715"
-       id="path11152"
-       style="opacity:1;color:#000000;fill:url(#linearGradient11170);fill-opacity:1;fill-rule:evenodd;stroke:#74796e;stroke-width:0.8505457;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:url(#radialGradient11234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93590021;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       id="path11154"
-       sodipodi:cx="25.785715"
-       sodipodi:cy="23.071428"
-       sodipodi:rx="18.214285"
-       sodipodi:ry="18.214285"
-       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
-       transform="matrix(1.06849,0,0,1.06849,-4.051771,-2.437299)" />
-    <path
-       sodipodi:nodetypes="czs"
-       id="path4743"
-       d="M 19.1468,14.674063 C 12.154448,18.486901 15.316371,29.412893 23.310313,29.412893 C 31.220984,29.412893 34.766419,19.054547 27.473824,14.674063"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       id="path4745"
-       d="M 23.364832,19.364034 L 23.364832,11.95091"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:2.99999905;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       transform="matrix(1.04555,0,0,1.04555,-3.460245,-1.908039)"
-       d="M 44 23.071428 A 18.214285 18.214285 0 1 1  7.5714302,23.071428 A 18.214285 18.214285 0 1 1  44 23.071428 z"
-       sodipodi:ry="18.214285"
-       sodipodi:rx="18.214285"
-       sodipodi:cy="23.071428"
-       sodipodi:cx="25.785715"
-       id="path4747"
-       style="opacity:0.88235294;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4755);stroke-width:0.95643449;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-  </g>
-</svg>

=== renamed file 'data/indicator-status.service.in' => 'data/indicator-me.service.in'
--- data/indicator-status.service.in	2009-07-24 21:57:58 +0000
+++ data/indicator-me.service.in	2010-01-04 21:25:21 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
-Name=org.ayatana.indicator.status
-Exec=@libexecdir@/indicator-status-service
+Name=org.ayatana.indicator.me
+Exec=@libexecdir@/indicator-me-service

=== removed file 'data/indicator-session.schemas.in'
--- data/indicator-session.schemas.in	2009-09-02 15:10:20 +0000
+++ data/indicator-session.schemas.in	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<gconfschemafile>
-  <schemalist>
-    <schema>
-      <key>/schemas/apps/indicator-session/suppress_logout_restart_shutdown</key>
-      <applyto>/apps/indicator-session/suppress_logout_restart_shutdown</applyto>
-      <owner>indicator-session</owner>
-      <type>bool</type>
-      <default>FALSE</default>
-      <locale name="C">
-	<short>Suppress the dialog to confirm logout, restart and shutdown action</short>
-	<long>Whether or not to show confirmation dialogs for logout,
-        restart and shutdown actions.</long>
-      </locale>
-    </schema>
-  </schemalist>
-</gconfschemafile>

=== removed file 'data/indicator-session.service.in'
--- data/indicator-session.service.in	2009-07-24 21:57:58 +0000
+++ data/indicator-session.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.ayatana.indicator.session
-Exec=@libexecdir@/indicator-session-service

=== removed file 'data/indicator-users.service.in'
--- data/indicator-users.service.in	2009-07-24 21:57:58 +0000
+++ data/indicator-users.service.in	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-[D-BUS Service]
-Name=org.ayatana.indicator.users
-Exec=@libexecdir@/indicator-users-service

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2009-09-08 15:09:45 +0000
+++ po/POTFILES.in	2010-01-04 21:25:21 +0000
@@ -1,14 +1,7 @@
 [encoding: UTF-8]
-data/indicator-session.schemas.in
-src/gtk-dialog/ck-pk-helper.c
-src/gtk-dialog/gconf-helper.c
-src/gtk-dialog/gtk-logout-helper.c
-src/gtk-dialog/logout-dialog.c
-src/indicator-session.c
-src/session-service.c
+src/indicator-me.c
 src/status-provider.c
 src/status-provider-pidgin.c
 src/status-provider-telepathy.c
 src/status-service.c
 src/status-service-dbus.c
-src/users-service.c

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2009-10-06 23:49:57 +0000
+++ src/Makefile.am	2010-01-04 21:25:21 +0000
@@ -1,35 +1,29 @@
-SUBDIRS = gtk-dialog
 
-libexec_PROGRAMS = indicator-status-service indicator-users-service indicator-session-service
+libexec_PROGRAMS = indicator-me-service
 
 ###################
 # Indicator Stuff
 ###################
 
-sessionlibdir = $(INDICATORDIR)
-sessionlib_LTLIBRARIES = libsession.la
-libsession_la_SOURCES = \
-	indicator-session.c \
+melibdir = $(INDICATORDIR)
+melib_LTLIBRARIES = libme.la
+libme_la_SOURCES = \
+	indicator-me.c \
 	dbus-shared-names.h \
-	status-service-client.h \
-	users-service-client.h
-libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
-libsession_la_LIBADD = $(APPLET_LIBS)
-libsession_la_LDFLAGS = -module -avoid-version
+	me-service-client.h
+libme_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
+libme_la_LIBADD = $(APPLET_LIBS)
+libme_la_LDFLAGS = -module -avoid-version
 
 ################
 # Status Stuff
 ################
 
-indicator_status_service_SOURCES = \
-	status-service.c \
-	status-service-dbus.h \
-	status-service-dbus.c \
-	status-service-server.h \
-	users-service-dbus.h \
-	users-service-dbus.c \
-	users-service-marshal.c \
-	users-service-marshal.h \
+indicator_me_service_SOURCES = \
+	me-service.c \
+	me-service-dbus.h \
+	me-service-dbus.c \
+	me-service-server.h \
 	status-provider.h \
 	status-provider.c \
 	status-provider-mc5.h \
@@ -44,39 +38,22 @@
 	status-provider-telepathy.c \
 	status-provider-telepathy-marshal.h \
 	status-provider-telepathy-marshal.c
-indicator_status_service_CFLAGS = $(STATUSSERVICE_CFLAGS) -Wall -Werror
-indicator_status_service_LDADD = $(STATUSSERVICE_LIBS)
-
-users-service-client.h: $(srcdir)/users-service.xml
-	dbus-binding-tool \
-		--prefix=_users_service_client \
-		--mode=glib-client \
-		--output=users-service-client.h \
-		$(srcdir)/users-service.xml
-
-status-service-client.h: $(srcdir)/status-service.xml
-	dbus-binding-tool \
-		--prefix=_status_service_client \
-		--mode=glib-client \
-		--output=status-service-client.h \
-		$(srcdir)/status-service.xml
-
-status-service-server.h: $(srcdir)/status-service.xml
-	dbus-binding-tool \
-		--prefix=_status_service_server \
+indicator_me_service_CFLAGS = $(STATUSSERVICE_CFLAGS) -Wall -Werror
+indicator_me_service_LDADD = $(STATUSSERVICE_LIBS)
+
+me-service-client.h: $(srcdir)/me-service.xml
+	dbus-binding-tool \
+		--prefix=_me_service_client \
+		--mode=glib-client \
+		--output=me-service-client.h \
+		$(srcdir)/me-service.xml
+
+me-service-server.h: $(srcdir)/me-service.xml
+	dbus-binding-tool \
+		--prefix=_me_service_server \
 		--mode=glib-server \
-		--output=status-service-server.h \
-		$(srcdir)/status-service.xml
-
-users-service-marshal.h: $(srcdir)/users-service.list
-	glib-genmarshal --header \
-		--prefix=_users_service_marshal $(srcdir)/users-service.list \
-		> users-service-marshal.h
-
-users-service-marshal.c: $(srcdir)/users-service.list
-	glib-genmarshal --body \
-		--prefix=_users_service_marshal $(srcdir)/users-service.list \
-		> users-service-marshal.c
+		--output=me-service-server.h \
+		$(srcdir)/me-service.xml
 
 status-provider-pidgin-marshal.h: $(srcdir)/status-provider-pidgin.list
 	glib-genmarshal --header \
@@ -109,52 +86,27 @@
 		> status-provider-mc5-marshal.c
 
 ###############
-# Users Stuff
-###############
-
-indicator_users_service_SOURCES = \
-	lock-helper.c \
-	lock-helper.h \
-	users-service.c \
-	users-service-dbus.c \
-	users-service-marshal.c
-indicator_users_service_CFLAGS = $(USERSSERVICE_CFLAGS) -Wall -Werror
-indicator_users_service_LDADD = $(USERSSERVICE_LIBS)
-
-#################
-# Session Stuff
-#################
-
-indicator_session_service_SOURCES = \
-	lock-helper.c \
-	lock-helper.h \
-	session-service.c \
-	gtk-dialog/gconf-helper.c
-indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
-indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
-
-###############
 # Other Stuff
 ###############
 
 BUILT_SOURCES = \
-	users-service-client.h \
-	status-service-client.h \
-	status-service-server.h \
+	me-service-client.h \
+	me-service-server.h \
 	status-provider-mc5-marshal.h \
 	status-provider-mc5-marshal.c \
-	users-service-marshal.h \
-	users-service-marshal.c \
 	status-provider-pidgin-marshal.h \
 	status-provider-pidgin-marshal.c \
 	status-provider-telepathy-marshal.h \
 	status-provider-telepathy-marshal.c
 
 EXTRA_DIST = \
-	status-service.xml \
+	me-service.xml \
 	status-provider-mc5.list \
 	status-provider-pidgin.list \
-	status-provider-telepathy.list
+	status-provider-telepathy.list \
+	users-service.xml \
+	users-service.list
 
 CLEANFILES = \
 	$(BUILT_SOURCES)
+

=== modified file 'src/dbus-shared-names.h'
--- src/dbus-shared-names.h	2009-09-10 21:26:01 +0000
+++ src/dbus-shared-names.h	2010-01-04 21:25:21 +0000
@@ -24,17 +24,10 @@
 #ifndef __DBUS_SHARED_NAMES_H__
 #define __DBUS_SHARED_NAMES_H__ 1
 
-#define INDICATOR_STATUS_DBUS_NAME  "org.ayatana.indicator.status"
-#define INDICATOR_STATUS_DBUS_OBJECT "/org/ayatana/indicator/status/menu"
-#define INDICATOR_STATUS_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/status/service"
-#define INDICATOR_STATUS_SERVICE_DBUS_INTERFACE "org.ayatana.indicator.status.service"
-
-#define INDICATOR_USERS_DBUS_NAME  "org.ayatana.indicator.users"
-#define INDICATOR_USERS_DBUS_OBJECT "/org/ayatana/indicator/users/menu"
-#define INDICATOR_USERS_SERVICE_DBUS_OBJECT "/org/gnome/DisplayManager/UserManager"
-#define INDICATOR_USERS_SERVICE_DBUS_INTERFACE "org.gnome.DisplayManager.UserManager"
-
-#define INDICATOR_SESSION_DBUS_NAME  "org.ayatana.indicator.session"
-#define INDICATOR_SESSION_DBUS_OBJECT "/org/ayatana/indicator/session/menu"
+#define INDICATOR_ME_DBUS_NAME  "org.ayatana.indicator.me"
+#define INDICATOR_ME_DBUS_VERSION  1
+#define INDICATOR_ME_DBUS_OBJECT "/org/ayatana/indicator/me/menu"
+#define INDICATOR_ME_SERVICE_DBUS_OBJECT "/org/ayatana/indicator/me/service"
+#define INDICATOR_ME_SERVICE_DBUS_INTERFACE "org.ayatana.indicator.me.service"
 
 #endif /* __DBUS_SHARED_NAMES_H__ */

=== removed directory 'src/gtk-dialog'
=== removed file 'src/gtk-dialog/Makefile.am'
--- src/gtk-dialog/Makefile.am	2009-09-10 22:02:32 +0000
+++ src/gtk-dialog/Makefile.am	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-
-libexec_PROGRAMS = gtk-logout-helper
-
-gtk_logout_helper_SOURCES = \
-	gtk-logout-helper.c \
-	ck-pk-helper.c \
-	ck-pk-helper.h \
-	gconf-helper.c \
-	gconf-helper.h \
-	logout-dialog.c \
-	logout-dialog.h
-
-gtk_logout_helper_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GTKLOGOUTHELPER_CFLAGS) $(GCONF_CFLAGS) -Wall -Werror -DINDICATOR_ICONS_DIR="\"$(INDICATORICONSDIR)\""
-gtk_logout_helper_LDADD =  $(SESSIONSERVICE_LIBS) $(GTKLOGOUTHELPER_LIBS) $(GCONF_LIBS)
-

=== removed file 'src/gtk-dialog/ck-pk-helper.c'
--- src/gtk-dialog/ck-pk-helper.c	2009-09-22 12:45:17 +0000
+++ src/gtk-dialog/ck-pk-helper.c	1970-01-01 00:00:00 +0000
@@ -1,222 +0,0 @@
-/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <unistd.h>
-#include <glib.h>
-#include <dbus/dbus-glib.h>
-#include <polkit/polkit.h>
-
-#include "logout-dialog.h"
-#include "ck-pk-helper.h"
-
-static gboolean
-ck_multiple_users (void)
-{
-	DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
-	g_return_val_if_fail(sbus != NULL, TRUE); /* worst case */
-	DBusGProxy * proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
-	                                                     "/org/freedesktop/ConsoleKit/Manager",
-	                                                     "org.freedesktop.ConsoleKit.Manager");
-
-	if (proxy == NULL) {
-		return TRUE;
-	}
-
-	gboolean result;
-	GPtrArray * seats = NULL;
-
-	result = dbus_g_proxy_call(proxy, "GetSeats", NULL, G_TYPE_INVALID,
-	                           dbus_g_type_get_collection("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &seats, G_TYPE_INVALID);
-
-	if (!result) {
-		g_warning("Unable to get the seats for ConsoleKit");
-		g_object_unref(proxy);
-		return TRUE;
-	}
-	
-	gchar * this_session_id = NULL;
-	
-	result = dbus_g_proxy_call(proxy, "GetCurrentSession", NULL, G_TYPE_INVALID,
-							DBUS_TYPE_G_OBJECT_PATH, &this_session_id, G_TYPE_INVALID);
-							
-	g_object_unref(proxy);
-							
-	if (!result) {
-		g_warning("Unable to get current session from ConsoleKit");
-		return TRUE;
-	}
-	
-	proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
-									this_session_id, "org.freedesktop.ConsoleKit.Session");
-
-	if (proxy == NULL) {
-		return TRUE;
-	}
-	
-	guint this_session_uid;
-	
-	result = dbus_g_proxy_call(proxy, "GetUnixUser", NULL, G_TYPE_INVALID,
-							G_TYPE_UINT, &this_session_uid, G_TYPE_INVALID);										
-
-	if (!result) {
-		g_warning("Unable to get UID from ConsoleKit");
-		return TRUE;
-	}
-	
-	guint seat;
-	gboolean multiple_users = FALSE;
-	for (seat = 0; seat < seats->len; seat++) {
-		gchar * seat_id = g_ptr_array_index(seats, seat);
-		DBusGProxy * seat_proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
-		                                                    seat_id, "org.freedesktop.ConsoleKit.Seat");
-		g_free(seat_id);
-
-		if (seat_proxy == NULL) {
-			continue;
-		}
-
-		GPtrArray * sessions = NULL;
-
-		gboolean result = dbus_g_proxy_call(seat_proxy,
-		                                    "GetSessions", NULL, G_TYPE_INVALID,
-	                                        dbus_g_type_get_collection("GPtrArray", DBUS_TYPE_G_OBJECT_PATH), &sessions, G_TYPE_INVALID);
-
-		g_object_unref(seat_proxy);
-		if (!result) {
-			continue;
-		}
-
-		guint session;
-		for (session = 0; session < sessions->len; session++) {
-			gchar * session_id = g_ptr_array_index(sessions, session);
-			if (g_strcmp0(this_session_id, session_id) == 0) {
-				continue;
-			}
-			DBusGProxy * session_proxy = dbus_g_proxy_new_for_name(sbus, "org.freedesktop.ConsoleKit",
-		                                                    	session_id, "org.freedesktop.ConsoleKit.Session");
-		    g_free(session_id);
-		    
-		    if (session_proxy == NULL) {
-		    	continue;
-		    }
-		    
-		    guint session_uid;
-		    result =  dbus_g_proxy_call(session_proxy, "GetUnixUser", NULL, G_TYPE_INVALID,
-		    							G_TYPE_UINT, &session_uid, G_TYPE_INVALID);	
-		    g_object_unref(session_proxy);
-		    							
-		    if (!result) {
-		    	continue;
-		    }
-		    
-		    if (session_uid != this_session_uid) {
-		    	multiple_users = TRUE;
-		    	break;
-		    }
-		}
-		
-		g_ptr_array_free(sessions, TRUE);
-		
-		if (multiple_users) {
-			break;
-		}
-	}
-
-	g_ptr_array_free(seats, TRUE);
-	g_object_unref(proxy);
-	g_free(this_session_id);
-
-	return multiple_users;
-}
-
-gboolean
-pk_require_auth (LogoutDialogAction action) {
-	if (action == LOGOUT_DIALOG_LOGOUT) {
-		return FALSE;
-	}
-
-	gchar * pk_action;
-	if (ck_multiple_users()) {
-		if (action == LOGOUT_DIALOG_RESTART) {
-			pk_action = "org.freedesktop.consolekit.system.restart-multiple-users";
-		} else {
-			pk_action = "org.freedesktop.consolekit.system.stop-multiple-users";
-		}
-	} else {
-		if (action == LOGOUT_DIALOG_RESTART) {
-			pk_action = "org.freedesktop.consolekit.system.restart";
-		} else {
-			pk_action = "org.freedesktop.consolekit.system.stop";
-		}
-	}
-
-	PolkitAuthorizationResult *polres = NULL;
-	gboolean ret = FALSE;
-	if (pk_can_do_action(pk_action, &polres)) {
-		if (polkit_authorization_result_get_is_challenge (polres)) {
-			ret = TRUE;
-		}
-		g_debug ("pk_require_auth(%s): authorized, is_challenge: %i", pk_action, ret);
-	} else {
-		g_debug ("pk_require_auth(%s): not authorized", pk_action);
-	}
-	if (polres) {
-		g_object_unref (polres);
-	}
-	return ret;
-}
-
-gboolean
-pk_can_do_action (const gchar    *action_id, PolkitAuthorizationResult ** pol_result)
-{
-	PolkitAuthority *authority;
-	PolkitSubject *subject;
-	PolkitAuthorizationResult *result;
-	gboolean ret;
-
-	authority = polkit_authority_get();
-	if (!authority) {
-		g_warning ("Could not get PolicyKit authority instance");
-		return FALSE;
-	}
-	subject = polkit_unix_process_new (getpid());
-
-	result = polkit_authority_check_authorization_sync (authority, subject, action_id, NULL, 0, NULL, NULL);
-	g_object_unref (authority);
-
-	ret = FALSE;
-	if (result) {
-		ret = polkit_authorization_result_get_is_authorized (result) || 
-		      polkit_authorization_result_get_is_challenge (result);
-		g_debug ("pk_can_do_action(%s): %i", action_id, ret);
-	} else {
-		g_warning ("pk_can_do_action(%s): check_authorization returned NULL", action_id);
-	}
-	if (pol_result) {
-		*pol_result = result;
-	} else {
-		g_object_unref (result);
-	}
-	return ret;
-	
-}

=== removed file 'src/gtk-dialog/ck-pk-helper.h'
--- src/gtk-dialog/ck-pk-helper.h	2009-09-22 12:45:17 +0000
+++ src/gtk-dialog/ck-pk-helper.h	1970-01-01 00:00:00 +0000
@@ -1,32 +0,0 @@
-/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef __CK_PK_HELPER_H__
-#define __CK_PK_HELPER_H__ 1
-
-#include <polkit/polkit.h>
-
-gboolean pk_require_auth (LogoutDialogAction action);
-gboolean pk_can_do_action (const gchar *action_id, PolkitAuthorizationResult ** pol_result);
-
-#endif /* __CK_PK_HELPER__ */

=== removed file 'src/gtk-dialog/gconf-helper.c'
--- src/gtk-dialog/gconf-helper.c	2009-09-10 22:05:42 +0000
+++ src/gtk-dialog/gconf-helper.c	1970-01-01 00:00:00 +0000
@@ -1,73 +0,0 @@
-/*
-A small wrapper utility for connecting to gconf.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Christoph Korn <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#include <gconf/gconf-client.h>
-
-#include <glib/gi18n.h>
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-
-#include <libdbusmenu-glib/server.h>
-#include <libdbusmenu-glib/menuitem.h>
-
-#include "gconf-helper.h"
-
-static GConfClient * gconf_client = NULL;
-
-gboolean
-supress_confirmations (void) {
-	if(!gconf_client) {
-		gconf_client = gconf_client_get_default ();
-	}
-	return gconf_client_get_bool (gconf_client, SUPPRESS_KEY, NULL) ;
-}
-
-static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GConfEntry  *entry, gpointer data) {
-	RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = (RestartShutdownLogoutMenuItems*) data;
-	GConfValue * value = gconf_entry_get_value (entry);
-	const gchar * key = gconf_entry_get_key (entry);
-
-	if(g_strcmp0 (key, SUPPRESS_KEY) == 0) {
-		if (gconf_value_get_bool (value)) {
-			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
-			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart"));
-			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown"));
-		} else {
-			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out..."));
-			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart..."));
-			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shutdown..."));
-		}
-	}
-}
-
-void
-update_menu_entries(RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi) {
-	if(!gconf_client) {
-		gconf_client = gconf_client_get_default ();
-	}
-	gconf_client_add_dir (gconf_client, GLOBAL_DIR,
-				GCONF_CLIENT_PRELOAD_ONELEVEL, NULL);
-	gconf_client_notify_add (gconf_client, SUPPRESS_KEY,
-				update_menu_entries_callback, restart_shutdown_logout_mi, NULL, NULL);
-}
-

=== removed file 'src/gtk-dialog/gconf-helper.h'
--- src/gtk-dialog/gconf-helper.h	2009-09-08 19:26:38 +0000
+++ src/gtk-dialog/gconf-helper.h	1970-01-01 00:00:00 +0000
@@ -1,50 +0,0 @@
-/*
-A small wrapper utility for connecting to gconf.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Christoph Korn <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-
-#ifndef __GCONF_HELPER_H__
-#define __GCONF_HELPER_H__ 1
-
-#include <gconf/gconf-client.h>
-
-#include <glib/gi18n.h>
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-
-#include <libdbusmenu-glib/server.h>
-#include <libdbusmenu-glib/menuitem.h>
-
-#define SUPPRESS_KEY	"/apps/indicator-session/suppress_logout_restart_shutdown"
-#define GLOBAL_DIR	"/apps/indicator-session"
-
-typedef struct _RestartShutdownLogoutMenuItems
-{
-	DbusmenuMenuitem * logout_mi;
-	DbusmenuMenuitem * restart_mi;
-	DbusmenuMenuitem * shutdown_mi;
-}
-RestartShutdownLogoutMenuItems;
-
-void update_menu_entries(RestartShutdownLogoutMenuItems*);
-gboolean supress_confirmations (void);
-
-#endif /* __GCONF_HELPER__ */

=== removed file 'src/gtk-dialog/gtk-logout-helper.c'
--- src/gtk-dialog/gtk-logout-helper.c	2009-09-24 17:24:09 +0000
+++ src/gtk-dialog/gtk-logout-helper.c	1970-01-01 00:00:00 +0000
@@ -1,173 +0,0 @@
-/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-    Christoph Korn <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <config.h>
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <dbus/dbus-glib.h>
-#include "logout-dialog.h"
-#include "ck-pk-helper.h"
-#include "gconf-helper.h"
-
-static void
-session_action (LogoutDialogAction action)
-{
-	DBusGConnection * sbus;
-	DBusGProxy * sm_proxy;
-	GError * error = NULL;
-	gboolean res = FALSE;
-	
-	sbus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL); 
-	if (sbus == NULL) {
-		g_warning("Unable to get DBus session bus.");
-		return;
-	}
-	sm_proxy = dbus_g_proxy_new_for_name_owner (sbus,
-                                            	"org.gnome.SessionManager",
-                                            	"/org/gnome/SessionManager",
-                                            	"org.gnome.SessionManager",
-                                           	 	&error);
-	if (sm_proxy == NULL) {
-		g_warning("Unable to get DBus proxy to SessionManager interface: %s", error->message);
-		g_error_free(error);
-		return;
-	}		
-	
-	g_clear_error (&error);
-	
-	if (action == LOGOUT_DIALOG_LOGOUT) {
-		res = dbus_g_proxy_call_with_timeout (sm_proxy, "Logout", INT_MAX, &error, 
-											  G_TYPE_UINT, 1, G_TYPE_INVALID, G_TYPE_INVALID);
-	} else if (action == LOGOUT_DIALOG_SHUTDOWN) {
-		res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestShutdown", INT_MAX, &error, 
-											  G_TYPE_INVALID, G_TYPE_INVALID);
-	} else if (action == LOGOUT_DIALOG_RESTART) {
-		res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestReboot", INT_MAX, &error, 
-											  G_TYPE_INVALID, G_TYPE_INVALID);
-	} else {
-		g_warning ("Unknown session action");
-	}
-	
-	if (!res) {
-		if (error != NULL) {
-			g_warning ("SessionManager action failed: %s", error->message);
-		} else {
-			g_warning ("SessionManager action failed: unknown error");
-		}
-	}
-	
-	g_object_unref(sm_proxy);
-	
-	if (error != NULL) {
-		g_error_free(error);
-	}
-	
-	return;
-}	
-
-static LogoutDialogAction type = LOGOUT_DIALOG_LOGOUT;
-
-static gboolean
-option_logout (const gchar * arg, const gchar * value, gpointer data, GError * error)
-{
-	type = LOGOUT_DIALOG_LOGOUT;
-	return TRUE;
-}
-
-static gboolean
-option_shutdown (const gchar * arg, const gchar * value, gpointer data, GError * error)
-{
-	type = LOGOUT_DIALOG_SHUTDOWN;
-	return TRUE;
-}
-
-static gboolean
-option_restart (const gchar * arg, const gchar * value, gpointer data, GError * error)
-{
-	type = LOGOUT_DIALOG_RESTART;
-	return TRUE;
-}
-
-static GOptionEntry options[] = {
-	{"logout",     'l',  G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,  option_logout,   "Log out of the current session",   NULL},
-	{"shutdown",   's',  G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,  option_shutdown, "Shutdown the entire system",       NULL},
-	{"restart",    'r',  G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,  option_restart,  "Restart the system",               NULL},
-
-	{NULL}
-};
-
-int
-main (int argc, char * argv[])
-{
-	gtk_init(&argc, &argv);
-
-	/* Setting up i18n and gettext.  Apparently, we need
-	   all of these. */
-	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-	GError * error = NULL;
-	GOptionContext * context = g_option_context_new(" - logout of the current session");
-	g_option_context_add_main_entries(context, options, "gtk-logout-helper");
-	g_option_context_add_group(context, gtk_get_option_group(TRUE));
-	g_option_context_set_help_enabled(context, TRUE);
-
-	if (!g_option_context_parse(context, &argc, &argv, &error)) {
-		g_debug("Option parsing failed: %s", error->message);
-		g_error_free(error);
-		return 1;
-	}
-
-	/* Init some theme/icon stuff */
-	gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(),
-	                                  INDICATOR_ICONS_DIR);
-
-	GtkWidget * dialog = NULL;
-	/* TODO: We're disabling PolicyKit checking here because there
-	   is a bug in ConsoleKit where the dialog doesn't come up until
-	   the session is entirely closed.  Stupid, but it's better than
-	   not getting a dialog at all. */
-	/* if (!pk_require_auth(type) && !supress_confirmations()) { */
-	if (!supress_confirmations()) {
-		dialog = logout_dialog_new(type);
-	}
-
-	if (dialog != NULL) {
-		GtkResponseType response = gtk_dialog_run(GTK_DIALOG(dialog));
-		gtk_widget_hide(dialog);
-
-		if (response == GTK_RESPONSE_HELP) {
-			type = LOGOUT_DIALOG_RESTART;
-			response = GTK_RESPONSE_OK;
-		}
-
-		if (response != GTK_RESPONSE_OK) {
-			return 0;
-		}
-	}
-
-	session_action(type);
-
-	return 0;
-}

=== removed file 'src/gtk-dialog/logout-dialog.c'
--- src/gtk-dialog/logout-dialog.c	2009-10-05 21:11:25 +0000
+++ src/gtk-dialog/logout-dialog.c	1970-01-01 00:00:00 +0000
@@ -1,371 +0,0 @@
-/*
- * libgksuui -- Gtk+ widget and convenience functions for requesting passwords
- * Copyright (C) 2004 Gustavo Noronha Silva
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA 02110-1301 USA
- */
-
-#include <string.h>
-#include <math.h>
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <glib/gi18n.h>
-#include <X11/XKBlib.h>
-
-#include "logout-dialog.h"
-#include "ck-pk-helper.h"
-
-enum {
-	PROP_ZERO,
-	PROP_ACTION
-};
-
-
-static void
-logout_dialog_class_init (LogoutDialogClass *klass);
-
-static void
-logout_dialog_init (LogoutDialog *logout_dialog);
-
-static void
-set_property (GObject * object, guint param_id, const GValue * value, GParamSpec *pspec);
-
-static void
-get_property (GObject * object, guint param_id, GValue * value, GParamSpec *pspec);
-
-static gboolean
-timer_cb (gpointer data);
-
-static void
-show_cb (GtkWidget * widget, gpointer data);
-
-static void
-check_restart (LogoutDialog * dialog);
-
-static gchar*
-get_plural_string (LogoutDialog * dialog);
-
-static const gchar * title_strings[LOGOUT_DIALOG_ACTION_CNT] = {
-	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("title", "Log Out"),
-	/* LOGOUT_DIALOG_RESTART, */	NC_("title", "Restart"),
-	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("title", "Shut Down")
-};
-
-static const gchar * button_strings[LOGOUT_DIALOG_ACTION_CNT] = {
-	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("button", "Log Out"),
-	/* LOGOUT_DIALOG_RESTART, */	NC_("button", "Restart"),
-	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button", "Shut Down")
-};
-
-static const gchar * restart_auth = N_("Restart...");
-
-static const gchar * body_logout_update = N_("You recently installed updates which will only take effect after a restart.  Restart to apply software updates.");
-
-static const gchar * icon_strings[LOGOUT_DIALOG_ACTION_CNT] = {
-	/* LOGOUT_DIALOG_LOGOUT, */ 	"system-log-out",
-	/* LOGOUT_DIALOG_RESTART, */	"system-restart",
-	/* LOGOUT_DIALOG_SHUTDOWN, */	"system-shutdown"
-};
-
-GType
-logout_dialog_get_type (void)
-{
-  static GType type = 0;
-
-  if (type == 0)
-    {
-      static const GTypeInfo info =
-	{
-	  sizeof (LogoutDialogClass), /* size of class */
-	  NULL, /* base_init */
-	  NULL, /* base_finalize */
-	  (GClassInitFunc) logout_dialog_class_init,
-	  NULL, /* class_finalize */
-	  NULL, /* class_data */
-	  sizeof (LogoutDialog), /* size of object */
-	  0, /* n_preallocs */
-	  (GInstanceInitFunc) logout_dialog_init /* instance_init */
-	};
-      type = g_type_register_static (gtk_dialog_get_type (),
-				     "LogoutDialogType",
-				     &info, 0);
-    }
-
-  return type;
-}
-
-static gchar*
-get_plural_string (LogoutDialog * dialog)
-{
-  static gchar *plural_string = "";
-
-  switch (dialog->action)
-    {
-    case LOGOUT_DIALOG_LOGOUT:
-      plural_string = ngettext("You will be logged out in %d second.",
-			       "You will be logged out in %d seconds.", 
-			       dialog->timeout);
-      break;
-    case LOGOUT_DIALOG_RESTART:
-      plural_string = ngettext("The computer will restart in %d second.",
-			       "The computer will restart in %d seconds.", 
-			       dialog->timeout);
-      break;
-    case LOGOUT_DIALOG_SHUTDOWN:
-      plural_string = ngettext("The computer will be shut down in %d second.",
-			       "The computer will be shut down in %d seconds.",
-			       dialog->timeout);
-      break;
-	default:
-	  break;
-    }
-  
-  return plural_string;
-}
-
-static void
-logout_dialog_class_init (LogoutDialogClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->set_property = set_property;
-  gobject_class->get_property = get_property;
-
-  g_object_class_install_property(gobject_class, PROP_ACTION,
-                                  g_param_spec_int("action", NULL, NULL,
-                                                   LOGOUT_DIALOG_LOGOUT, LOGOUT_DIALOG_SHUTDOWN,
-                                                   LOGOUT_DIALOG_LOGOUT, G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY));
-
-  return;
-}
-
-static void
-set_property (GObject * object, guint param_id, const GValue * value, GParamSpec *pspec)
-{
-	g_return_if_fail(param_id == PROP_ACTION);
-
-	LogoutDialog * dialog = LOGOUT_DIALOG(object);
-	dialog->action = (LogoutDialogAction)g_value_get_int(value);
-
-	gtk_image_set_from_icon_name(GTK_IMAGE(dialog->image), icon_strings[dialog->action], GTK_ICON_SIZE_DIALOG);
-	gtk_window_set_title (GTK_WINDOW(dialog), _(title_strings[dialog->action]));
-	gtk_window_set_icon_name (GTK_WINDOW(dialog), icon_strings[dialog->action]);
-	gtk_widget_hide(dialog->message);
-	gtk_button_set_label(GTK_BUTTON(dialog->ok_button), _(button_strings[dialog->action]));
-
-	gchar * timeouttxt = g_strdup_printf(get_plural_string(dialog), dialog->timeout);
-	gtk_label_set_text(GTK_LABEL(dialog->timeout_text), timeouttxt);
-	g_free(timeouttxt);
-
-	check_restart(dialog);
-
-	return;
-}
-
-static void
-get_property (GObject * object, guint param_id, GValue * value, GParamSpec *pspec)
-{
-	g_return_if_fail(param_id == PROP_ACTION);
-	g_value_set_int(value, LOGOUT_DIALOG(object)->action);
-}
-
-static gboolean
-timer_cb (gpointer data)
-{
-	LogoutDialog * dialog = LOGOUT_DIALOG(data);
-
-	if (dialog->timeout == 0) {
-		gtk_dialog_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
-		dialog->timerfunc = 0;
-		return FALSE;
-	} else {
-		dialog->timeout--;
-
-		gchar * timeouttxt = g_strdup_printf(get_plural_string(dialog), dialog->timeout);
-		gtk_label_set_text(GTK_LABEL(dialog->timeout_text), timeouttxt);
-		g_free(timeouttxt);
-	}
-
-	return TRUE;
-}
-
-static void
-show_cb (GtkWidget * widget, gpointer data)
-{
-	LogoutDialog * dialog = LOGOUT_DIALOG(widget);
-
-	if (dialog->timerfunc != 0) {
-		g_source_remove(dialog->timerfunc);
-		dialog->timerfunc = 0;
-	}
-
-	dialog->timerfunc = g_timeout_add_seconds(1, timer_cb, dialog);
-	return;
-}
-
-static void
-check_restart (LogoutDialog * dialog)
-{
-	if (dialog->action != LOGOUT_DIALOG_LOGOUT) {
-		return;
-	}
-
-	if (g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS)) {
-		if (pk_can_do_action("org.freedesktop.consolekit.system.restart", NULL) ||
-			pk_can_do_action("org.freedesktop.consolekit.system.restart-multiple-users", NULL)) {
-
-			gtk_label_set_text(GTK_LABEL(dialog->message), _(body_logout_update));
-			gtk_widget_show(dialog->message);
-			if (pk_require_auth(LOGOUT_DIALOG_RESTART)) {
-			  gtk_button_set_label(GTK_BUTTON(dialog->restart_button), _(restart_auth));
-			} else {
-			  gtk_button_set_label(GTK_BUTTON(dialog->restart_button), _(button_strings[LOGOUT_DIALOG_RESTART]));
-			}
-			gtk_widget_show(dialog->restart_button);
-		}
-	}
-
-	return;
-}
-
-static gboolean
-focus_out_cb (GtkWidget *widget, GdkEventFocus *event, gpointer user_data)
-{
-  gtk_window_present (GTK_WINDOW(widget));
-  return TRUE;
-}
-
-static void
-logout_dialog_init (LogoutDialog *logout_dialog)
-{
-  GtkDialog *dialog;
-  gint      border_width = 6;
-
-  logout_dialog->timeout = 60;
-  logout_dialog->timerfunc = 0;
-
-  /* dialog window */
-  dialog = GTK_DIALOG(logout_dialog);
-
-  /* make sure that our window will always have the focus */
-  g_signal_connect (G_OBJECT(dialog), "focus-out-event",
-		    G_CALLBACK(focus_out_cb), NULL);
-
-  logout_dialog->main_vbox = dialog->vbox;
-
-  gtk_window_set_title (GTK_WINDOW(logout_dialog), "");
-  gtk_dialog_set_has_separator (GTK_DIALOG(logout_dialog), FALSE);
-  gtk_container_set_border_width (GTK_CONTAINER(logout_dialog), border_width);
-  gtk_box_set_spacing (GTK_BOX(logout_dialog->main_vbox), 12);
-  gtk_window_set_resizable (GTK_WINDOW(logout_dialog), FALSE);
-
-  gtk_window_stick(GTK_WINDOW(logout_dialog));
-  gtk_window_set_keep_above(GTK_WINDOW(logout_dialog), TRUE);
-  gtk_widget_realize(GTK_WIDGET(logout_dialog));
-  /* remove superfluous window buttons */
-  gdk_window_set_functions (GTK_WIDGET(logout_dialog)->window, 0);
-  gdk_window_set_decorations (GTK_WIDGET(logout_dialog)->window, GDK_DECOR_BORDER | GDK_DECOR_TITLE);
-
-  /* center window */
-  gtk_window_set_position (GTK_WINDOW(logout_dialog), GTK_WIN_POS_CENTER);
-
-  /* the action buttons */
-  /*  the cancel button  */
-  logout_dialog->restart_button = gtk_dialog_add_button (dialog,
-						      GTK_STOCK_HELP,
-						      GTK_RESPONSE_HELP);
-  gtk_button_set_label(GTK_BUTTON(logout_dialog->restart_button), _(button_strings[LOGOUT_DIALOG_RESTART]));
-  gtk_widget_hide(logout_dialog->restart_button);
-
-  /*  the cancel button  */
-  logout_dialog->cancel_button = gtk_dialog_add_button (dialog,
-						      GTK_STOCK_CANCEL,
-						      GTK_RESPONSE_CANCEL);
-  /*  the ok button  */
-  logout_dialog->ok_button = gtk_dialog_add_button (dialog,
-						  GTK_STOCK_OK,
-						  GTK_RESPONSE_OK);
-  gtk_widget_grab_default (logout_dialog->ok_button);
-
-  /* Window Title and Icon */
-  gtk_window_set_title (GTK_WINDOW(logout_dialog), _(title_strings[logout_dialog->action]));
-  gtk_window_set_icon_name (GTK_WINDOW(logout_dialog), icon_strings[logout_dialog->action]);
-
-  /* hbox */
-  logout_dialog->hbox = gtk_hbox_new (FALSE, 12);
-  gtk_container_set_border_width (GTK_CONTAINER(logout_dialog->hbox), 6);
-  gtk_box_pack_start (GTK_BOX(logout_dialog->main_vbox),
-		      logout_dialog->hbox, FALSE, FALSE, 0);
-  gtk_widget_show (logout_dialog->hbox);
-
-  /* image */
-  logout_dialog->image =
-    gtk_image_new_from_icon_name (icon_strings[logout_dialog->action],
-			      GTK_ICON_SIZE_DIALOG);
-  gtk_misc_set_alignment (GTK_MISC(logout_dialog->image), 0.5, 0);
-  gtk_box_pack_start (GTK_BOX(logout_dialog->hbox), logout_dialog->image,
-		      FALSE, FALSE, 0);
-  gtk_widget_show (logout_dialog->image);
-
-  /* vbox for text */
-  logout_dialog->vbox_text = gtk_vbox_new(FALSE, 12);
-  gtk_box_pack_start(GTK_BOX(logout_dialog->hbox), logout_dialog->vbox_text, TRUE, TRUE, 0);
-  gtk_widget_show(logout_dialog->vbox_text);
-
-  /* Message */
-  logout_dialog->message = gtk_label_new("");
-  gtk_label_set_line_wrap(GTK_LABEL(logout_dialog->message), TRUE);
-  gtk_label_set_single_line_mode(GTK_LABEL(logout_dialog->message), FALSE);
-  gtk_label_set_selectable(GTK_LABEL(logout_dialog->message), TRUE);
-  gtk_misc_set_alignment (GTK_MISC(logout_dialog->message), 0.0, 0.0);
-  gtk_box_pack_start(GTK_BOX(logout_dialog->vbox_text), logout_dialog->message, TRUE, TRUE, 0);
-  gtk_widget_show(logout_dialog->message);
-
-  /* timeout */
-  logout_dialog->timeout_text = gtk_label_new("");
-  gtk_label_set_line_wrap(GTK_LABEL(logout_dialog->timeout_text), TRUE);
-  gtk_label_set_single_line_mode(GTK_LABEL(logout_dialog->timeout_text), FALSE);
-  gtk_label_set_selectable(GTK_LABEL(logout_dialog->timeout_text), FALSE);
-  gtk_misc_set_alignment (GTK_MISC(logout_dialog->timeout_text), 0.0, 0.5);
-  gtk_box_pack_start(GTK_BOX(logout_dialog->vbox_text), logout_dialog->timeout_text, TRUE, TRUE, 0);
-  gtk_widget_show(logout_dialog->timeout_text);
-
-  g_signal_connect(G_OBJECT(logout_dialog), "show", G_CALLBACK(show_cb), logout_dialog);
-
-  return;
-}
-
-/**
- * logout_dialog_new:
- *
- * Creates a new #LogoutDialog.
- *
- * Returns: the new #LogoutDialog
- */
-GtkWidget*
-logout_dialog_new (LogoutDialogAction action)
-{
-  LogoutDialog * dialog = g_object_new (LOGOUT_TYPE_DIALOG, "action", action, NULL);
-  return GTK_WIDGET(dialog);
-}
-
-LogoutDialogAction
-logout_dialog_get_action (LogoutDialog * dialog)
-{
-	return dialog->action;
-}
-

=== removed file 'src/gtk-dialog/logout-dialog.h'
--- src/gtk-dialog/logout-dialog.h	2009-08-11 13:25:43 +0000
+++ src/gtk-dialog/logout-dialog.h	1970-01-01 00:00:00 +0000
@@ -1,99 +0,0 @@
-/*
- * libgksuui -- Gtk+ widget and convenience functions for requesting passwords
- * Copyright (C) 2004 Gustavo Noronha Silva
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
- * Boston, MA 02110-1301 USA
- */
-
-#ifndef __LOGOUT_DIALOG_H__
-#define __LOGOUT_DIALOG_H__
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define LOGOUT_TYPE_DIALOG (logout_dialog_get_type ())
-#define LOGOUT_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), LOGOUT_TYPE_DIALOG, LogoutDialog))
-#define LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), LOGOUT_TYPE_DIALOG, LogoutDialogClass))
-#define LOGOUT_IS_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), LOGOUT_TYPE_DIALOG))
-#define LOGOUT_IS_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_TYPE_CONTEXT))
-#define LOGOUT_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_TYPE_DIALOG, LogoutDialogClass))
-
-typedef struct _LogoutDialogClass LogoutDialogClass;
-typedef struct _LogoutDialog LogoutDialog;
-typedef enum _LogoutDialogAction LogoutDialogAction;
-
-enum _LogoutDialogAction {
-	LOGOUT_DIALOG_LOGOUT,
-	LOGOUT_DIALOG_RESTART,
-	LOGOUT_DIALOG_SHUTDOWN,
-	LOGOUT_DIALOG_ACTION_CNT
-};
-
-struct _LogoutDialogClass
-{
-  GtkDialogClass parent_class;
-};
-
-/**
- * LogoutDialog:
- * @dialog: parent widget
- * @main_vbox: GtkDialog's vbox
- * @hbox: box to separate the image of the right-side widgets
- * @image: the authorization image, left-side widget
- * @entry_vbox: right-side widgets container
- * @label: message describing what is required from the user,
- * right-side widget
- * @entry: place to type the password in, right-side widget
- * @ok_button: OK button of the dialog
- * @cancel_button: Cancel button of the dialog
- *
- * Convenience widget based on #GtkDialog to request a password.
- */
-struct _LogoutDialog
-{
-  GtkDialog dialog;
-
-  GtkWidget *main_vbox;
-  GtkWidget *hbox;
-  GtkWidget *image;
-  GtkWidget *ok_button;
-  GtkWidget *cancel_button;
-  GtkWidget *restart_button;
-  GtkWidget *vbox_text;
-  GtkWidget *message;
-  GtkWidget *timeout_text;
-
-  LogoutDialogAction action;
-
-  /* private */
-  gchar *         timeout_result;
-  guint           timeout;
-  guint           timerfunc;
-};
-
-GType
-logout_dialog_get_type (void);
-
-GtkWidget*
-logout_dialog_new (LogoutDialogAction action);
-
-LogoutDialogAction
-logout_dialog_get_action (LogoutDialog * widget);
-
-G_END_DECLS
-
-#endif

=== renamed file 'src/indicator-session.c' => 'src/indicator-me.c'
--- src/indicator-session.c	2009-11-04 22:34:26 +0000
+++ src/indicator-me.c	2010-01-04 21:25:21 +0000
@@ -1,6 +1,6 @@
 /*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
+A menu that should be close to the user, it's the user's status,
+their friends.  All about them.  It's a user-focused-menu.
 
 Copyright 2009 Canonical Ltd.
 
@@ -23,91 +23,70 @@
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
-#include <libdbusmenu-gtk/client.h>
+#include <libdbusmenu-gtk/menu.h>
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
 
 #include <libindicator/indicator.h>
 #include <libindicator/indicator-object.h>
+#include <libindicator/indicator-service-manager.h>
 
 #include "dbus-shared-names.h"
-#include "status-service-client.h"
-
-#define INDICATOR_SESSION_TYPE            (indicator_session_get_type ())
-#define INDICATOR_SESSION(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_SESSION_TYPE, IndicatorSession))
-#define INDICATOR_SESSION_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_SESSION_TYPE, IndicatorSessionClass))
-#define IS_INDICATOR_SESSION(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_SESSION_TYPE))
-#define IS_INDICATOR_SESSION_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_SESSION_TYPE))
-#define INDICATOR_SESSION_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_SESSION_TYPE, IndicatorSessionClass))
-
-typedef struct _IndicatorSession      IndicatorSession;
-typedef struct _IndicatorSessionClass IndicatorSessionClass;
-
-struct _IndicatorSessionClass {
+#include "me-service-client.h"
+
+#define INDICATOR_ME_TYPE            (indicator_me_get_type ())
+#define INDICATOR_ME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_ME_TYPE, IndicatorMe))
+#define INDICATOR_ME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_ME_TYPE, IndicatorMeClass))
+#define IS_INDICATOR_ME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), INDICATOR_ME_TYPE))
+#define IS_INDICATOR_ME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), INDICATOR_ME_TYPE))
+#define INDICATOR_ME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), INDICATOR_ME_TYPE, IndicatorMeClass))
+
+#define DEFAULT_ICON   "user-offline"
+
+typedef struct _IndicatorMe      IndicatorMe;
+typedef struct _IndicatorMeClass IndicatorMeClass;
+
+struct _IndicatorMeClass {
 	IndicatorObjectClass parent_class;
 };
 
-struct _IndicatorSession {
+struct _IndicatorMe {
 	IndicatorObject parent;
+	IndicatorServiceManager * service;
 };
 
-GType indicator_session_get_type (void);
+GType indicator_me_get_type (void);
 
 /* Indicator stuff */
 INDICATOR_SET_VERSION
-INDICATOR_SET_TYPE(INDICATOR_SESSION_TYPE)
+INDICATOR_SET_TYPE(INDICATOR_ME_TYPE)
 
 /* Globals */
-static DbusmenuGtkClient * status_client = NULL;
-static DbusmenuGtkClient * users_client = NULL;
-static DbusmenuGtkClient * session_client = NULL;
-
-static GtkMenu * main_menu = NULL;
 static GtkImage * status_image = NULL;
-
-static GtkWidget * status_separator = NULL;
-static GtkWidget * users_separator = NULL;
-#define SEPARATOR_SHOWN(sep) (sep != NULL && GTK_WIDGET_VISIBLE(sep))
-static GtkWidget * loading_item = NULL;
-
-static DBusGConnection * connection = NULL;
-static DBusGProxy * proxy = NULL;
 static DBusGProxy * status_proxy = NULL;
 
-typedef enum {
-	STATUS_SECTION,
-	USERS_SECTION,
-	SESSION_SECTION,
-	END_OF_SECTIONS
-} section_t;
-
 /* Prototypes */
-static void child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint position, gpointer section);
-static guint status_menu_pos_offset (void);
-static guint users_menu_pos_offset (void);
-static guint session_menu_pos_offset (void);
-static void child_realized (DbusmenuMenuitem * child, gpointer userdata);
-static gboolean start_service (gpointer userdata);
-static void start_service_phase2 (DBusGProxy * proxy, guint status, GError * error, gpointer data);
 static GtkLabel * get_label (IndicatorObject * io);
 static GtkImage * get_icon (IndicatorObject * io);
 static GtkMenu * get_menu (IndicatorObject * io);
 
-static void indicator_session_class_init (IndicatorSessionClass *klass);
-static void indicator_session_init       (IndicatorSession *self);
-static void indicator_session_dispose    (GObject *object);
-static void indicator_session_finalize   (GObject *object);
+static void indicator_me_class_init (IndicatorMeClass *klass);
+static void indicator_me_init       (IndicatorMe *self);
+static void indicator_me_dispose    (GObject *object);
+static void indicator_me_finalize   (GObject *object);
+static void connection_changed      (IndicatorServiceManager * sm, gboolean connected, gpointer userdata);
+static void status_icon_cb (DBusGProxy * proxy, char * icons, GError *error, gpointer userdata);
 
-G_DEFINE_TYPE (IndicatorSession, indicator_session, INDICATOR_OBJECT_TYPE);
+G_DEFINE_TYPE (IndicatorMe, indicator_me, INDICATOR_OBJECT_TYPE);
 
 static void
-indicator_session_class_init (IndicatorSessionClass *klass)
+indicator_me_class_init (IndicatorMeClass *klass)
 {
 	GObjectClass *object_class = G_OBJECT_CLASS (klass);
 
-	object_class->dispose = indicator_session_dispose;
-	object_class->finalize = indicator_session_finalize;
+	object_class->dispose = indicator_me_dispose;
+	object_class->finalize = indicator_me_finalize;
 
 	IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass);
 	io_class->get_label = get_label;
@@ -118,25 +97,32 @@
 }
 
 static void
-indicator_session_init (IndicatorSession *self)
-{
-
-	return;
-}
-
-static void
-indicator_session_dispose (GObject *object)
-{
-
-	G_OBJECT_CLASS (indicator_session_parent_class)->dispose (object);
-	return;
-}
-
-static void
-indicator_session_finalize (GObject *object)
-{
-
-	G_OBJECT_CLASS (indicator_session_parent_class)->finalize (object);
+indicator_me_init (IndicatorMe *self)
+{
+
+	/* Init variables */
+	self->service = NULL;
+
+	/* Do stuff with them */
+	self->service = indicator_service_manager_new_version(INDICATOR_ME_DBUS_NAME, INDICATOR_ME_DBUS_VERSION);
+	g_signal_connect(G_OBJECT(self->service), INDICATOR_SERVICE_MANAGER_SIGNAL_CONNECTION_CHANGE, G_CALLBACK(connection_changed), self);
+
+	return;
+}
+
+static void
+indicator_me_dispose (GObject *object)
+{
+
+	G_OBJECT_CLASS (indicator_me_parent_class)->dispose (object);
+	return;
+}
+
+static void
+indicator_me_finalize (GObject *object)
+{
+
+	G_OBJECT_CLASS (indicator_me_parent_class)->finalize (object);
 	return;
 }
 
@@ -151,198 +137,26 @@
 static GtkImage *
 get_icon (IndicatorObject * io)
 {
-	g_debug("Changing status icon: '%s'", "system-shutdown-panel");
-	status_image = GTK_IMAGE(gtk_image_new_from_icon_name("system-shutdown-panel", GTK_ICON_SIZE_MENU));
-	gtk_widget_show(GTK_WIDGET(status_image));
+	if (status_image == NULL) {
+		/* Will create the status icon if it doesn't exist already */
+		status_icon_cb(NULL, DEFAULT_ICON, NULL, NULL);
+	}
 	return status_image;
 }
 
-typedef struct _realized_data_t realized_data_t;
-struct _realized_data_t {
-	section_t section;
-};
-
-static void 
-resort_menu (void)
-{
-	guint location = 0;
-	guint clientnum;
-
-	for (clientnum = 0; clientnum < 3; clientnum++) {
-		DbusmenuGtkClient * client = NULL;
-		if (clientnum == 0) client = status_client;
-		if (clientnum == 1) client = users_client;
-		if (clientnum == 2) client = session_client;
-
-		if (client == NULL) continue;
-
-		DbusmenuMenuitem * root = dbusmenu_client_get_root(DBUSMENU_CLIENT(client));
-
-		GList * children = dbusmenu_menuitem_get_children(root);
-		if (children == NULL) {
-			continue;
-		}
-
-		GList * child;
-		for (child = children; child != NULL; child = g_list_next(child)) {
-			GtkMenuItem * widget = dbusmenu_gtkclient_menuitem_get(client, DBUSMENU_MENUITEM(child->data));
-			if (widget != NULL) {
-				gtk_menu_reorder_child(main_menu, GTK_WIDGET(widget), location);
-				location++;
-			}
-		}
-
-		if (clientnum == 0) {
-			gtk_menu_reorder_child(main_menu, status_separator, location);
-			location++;
-		}
-		if (clientnum == 1) {
-			gtk_menu_reorder_child(main_menu, users_separator, location);
-			location++;
-		}
-	}
-
-	return;
-}
-
-static void
-child_added (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint position, gpointer section)
-{
-	realized_data_t * data = g_new0(realized_data_t, 1);
-	if (data == NULL) {
-		g_warning("Unable to allocate data for realization of item");
-		return;
-	}
-
-	data->section = GPOINTER_TO_UINT(section);
-
-	g_signal_connect(G_OBJECT(child), DBUSMENU_MENUITEM_SIGNAL_REALIZED, G_CALLBACK(child_realized), data);
-	return;
-}
-
-static void
-child_realized (DbusmenuMenuitem * child, gpointer userdata)
-{
-	g_return_if_fail(userdata != NULL);
-	g_return_if_fail(DBUSMENU_IS_MENUITEM(child));
-
-	realized_data_t * data = (realized_data_t *)userdata;	
-	section_t section = data->section;
-	g_free(data);
-
-	DbusmenuGtkClient * client = NULL;
-	gchar * errorstr = NULL;
-	guint (*posfunc) (void) = NULL;
-
-	switch (section) {
-		case STATUS_SECTION:
-			client = status_client;
-			errorstr = "Status";
-			posfunc = status_menu_pos_offset;
-			break;
-		case USERS_SECTION:
-			client = users_client;
-			errorstr = "Users";
-			posfunc = users_menu_pos_offset;
-			break;
-		case SESSION_SECTION:
-			client = session_client;
-			errorstr = "Session";
-			posfunc = session_menu_pos_offset;
-			break;
-		default:
-			g_warning("Child Added called with an unknown position function!");
-			return;
-	}
-
-	if (client == NULL) {
-		g_warning("Child realized for a menu we don't have?  Section: %s", errorstr);
-		return;
-	}
-
-	GtkMenuItem * widget = dbusmenu_gtkclient_menuitem_get(client, child);
-
-	if (widget == NULL) {
-		g_warning("Had a menu item added to the %s menu, but yet it didn't have a GtkWidget with it.  Can't add that to a menu now can we?  You need to figure this @#$# out!", errorstr);
-		return;
-	}
-
-	gtk_menu_append(main_menu, GTK_WIDGET(widget));
-	gtk_widget_show(GTK_WIDGET(widget));
-
-	resort_menu();
-
-	gtk_widget_hide(loading_item);
-
-	return;
-}
-
-static void
-child_moved (DbusmenuMenuitem * parent, DbusmenuMenuitem * child, guint newpos, guint oldpos, guint (*posfunc) (void))
-{
-
-
-}
-
-
-/* Status Menu */
-static guint
-status_menu_pos_offset (void)
-{
-	return 0;
-}
-
-static void
-status_menu_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint position, gpointer user_data)
-{
-	gtk_widget_show(GTK_WIDGET(status_separator));
-	return;
-}
-
-static void
-status_menu_removed (DbusmenuMenuitem * root, DbusmenuMenuitem * child, gpointer user_data)
-{
-	if (g_list_length(dbusmenu_menuitem_get_children(root)) == 0) {
-		gtk_widget_hide(GTK_WIDGET(status_separator));
-	}
-
-	return;
-}
-
-static void
-status_menu_root_changed(DbusmenuGtkClient * client, DbusmenuMenuitem * newroot, GtkMenu * main)
-{
-	if (newroot == NULL) {
-		gtk_widget_hide(GTK_WIDGET(status_separator));
-		return;
-	}
-
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED,   G_CALLBACK(child_added),           GUINT_TO_POINTER(STATUS_SECTION));
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED, G_CALLBACK(status_menu_added),     NULL);
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED, G_CALLBACK(status_menu_removed),   NULL);
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED,   G_CALLBACK(child_moved),           GUINT_TO_POINTER(STATUS_SECTION));
-
-	GList * child = NULL;
-	guint count = 0;
-	for (child = dbusmenu_menuitem_get_children(newroot); child != NULL; child = g_list_next(child), count++) {
-		child_added(newroot, DBUSMENU_MENUITEM(child->data), count, GUINT_TO_POINTER(STATUS_SECTION));
-	}
-
-	if (count > 0) {
-		gtk_widget_show(GTK_WIDGET(status_separator));
-	}
-
-	return;
-}
-
 static void
 status_icon_cb (DBusGProxy * proxy, char * icons, GError *error, gpointer userdata)
 {
-	g_return_if_fail(status_image != NULL);
 	g_return_if_fail(icons != NULL);
 	g_return_if_fail(icons[0] != '\0');
 
 	g_debug("Changing status icon: '%s'", icons);
+
+	if (status_image == NULL) {
+		status_image = GTK_IMAGE(gtk_image_new_from_icon_name(DEFAULT_ICON, GTK_ICON_SIZE_MENU));
+		gtk_widget_show(GTK_WIDGET(status_image));
+	}
+
 	gtk_image_set_from_icon_name(status_image, icons, GTK_ICON_SIZE_MENU);
 
 	return;
@@ -354,289 +168,44 @@
 	return status_icon_cb(proxy, icon, NULL, NULL);
 }
 
-
-static gboolean
-connect_to_status (gpointer userdata)
+static void
+connection_changed (IndicatorServiceManager * sm, gboolean connected, gpointer userdata)
 {
-	if (status_proxy == NULL) {
-		GError * error = NULL;
-
-		DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-
-		status_proxy = dbus_g_proxy_new_for_name_owner(sbus,
-		                                               INDICATOR_STATUS_DBUS_NAME,
-		                                               INDICATOR_STATUS_SERVICE_DBUS_OBJECT,
-		                                               INDICATOR_STATUS_SERVICE_DBUS_INTERFACE,
-		                                               &error);
-
-		if (error != NULL) {
-			g_warning("Unable to get status proxy: %s", error->message);
-			g_error_free(error);
-			return FALSE;
+	if (connected) {
+		if (status_proxy == NULL) {
+			GError * error = NULL;
+
+			DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
+
+			status_proxy = dbus_g_proxy_new_for_name_owner(sbus,
+														   INDICATOR_ME_DBUS_NAME,
+														   INDICATOR_ME_SERVICE_DBUS_OBJECT,
+														   INDICATOR_ME_SERVICE_DBUS_INTERFACE,
+														   &error);
+
+			if (error != NULL) {
+				g_warning("Unable to get status proxy: %s", error->message);
+				g_error_free(error);
+			}
+
+			dbus_g_proxy_add_signal(status_proxy, "StatusIconsChanged", G_TYPE_STRING, G_TYPE_INVALID);
+			dbus_g_proxy_connect_signal(status_proxy, "StatusIconsChanged", G_CALLBACK(status_icon_changed), NULL, NULL);
 		}
 
-		dbus_g_proxy_add_signal(status_proxy, "StatusIconsChanged", G_TYPE_STRING, G_TYPE_INVALID);
-		dbus_g_proxy_connect_signal(status_proxy, "StatusIconsChanged", G_CALLBACK(status_icon_changed), NULL, NULL);
-	}
-
-	org_ayatana_indicator_status_service_status_icons_async(status_proxy, status_icon_cb, NULL);
-
-	return FALSE;
-}
-
-/* Follow up the service being started by connecting
-   up the DBus Menu Client and creating our separator.
-   Also creates an idle func to connect to the service for
-   getting the icon that we should be using on the panel. */
-static void
-status_followup (void)
-{
-	status_client = dbusmenu_gtkclient_new(INDICATOR_STATUS_DBUS_NAME, INDICATOR_STATUS_DBUS_OBJECT);
-	g_signal_connect(G_OBJECT(status_client), DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED, G_CALLBACK(status_menu_root_changed), main_menu);
-
-	status_separator = gtk_separator_menu_item_new();
-	gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), status_separator);
-	gtk_widget_hide(status_separator); /* Should be default, I'm just being explicit.  $(%*#$ hide already!  */
-
-	g_idle_add(connect_to_status, NULL);
-
-	return;
-}
-
-/* Users menu */
-
-static guint
-users_menu_pos_offset (void)
-{
-	guint position = 0;
-	if (SEPARATOR_SHOWN(status_separator)) {
-		GList * location = g_list_find(GTK_MENU_SHELL(main_menu)->children, status_separator);
-		position = g_list_position(GTK_MENU_SHELL(main_menu)->children, location) + 1;
-	}
-
-	return position;
-}
-
-static void
-users_menu_added (DbusmenuMenuitem * root, DbusmenuMenuitem * child, guint position, gpointer user_data)
-{
-	gtk_widget_show(GTK_WIDGET(users_separator));
-	return;
-}
-
-static void
-users_menu_removed (DbusmenuMenuitem * root, DbusmenuMenuitem * child, gpointer user_data)
-{
-	if (g_list_length(dbusmenu_menuitem_get_children(root)) == 0) {
-		gtk_widget_hide(GTK_WIDGET(users_separator));
-	}
-
-	return;
-}
-
-static void
-users_menu_root_changed(DbusmenuGtkClient * client, DbusmenuMenuitem * newroot, GtkMenu * main)
-{
-	if (newroot == NULL) {
-		gtk_widget_hide(GTK_WIDGET(users_separator));
-		return;
-	}
-
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED,   G_CALLBACK(child_added),           GUINT_TO_POINTER(USERS_SECTION));
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED, G_CALLBACK(users_menu_added),      NULL);
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED, G_CALLBACK(users_menu_removed),    NULL);
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED,   G_CALLBACK(child_moved),           GUINT_TO_POINTER(USERS_SECTION));
-
-	GList * child = NULL;
-	guint count = 0;
-	for (child = dbusmenu_menuitem_get_children(newroot); child != NULL; child = g_list_next(child), count++) {
-		child_added(newroot, DBUSMENU_MENUITEM(child->data), count, GUINT_TO_POINTER(USERS_SECTION));
-	}
-
-	if (count > 0) {
-		gtk_widget_show(GTK_WIDGET(users_separator));
-	}
-
-	return;
-}
-
-/* Follow up the service being started by connecting
-   up the DBus Menu Client and creating our separator. */
-static void
-users_followup (void)
-{
-	users_client = dbusmenu_gtkclient_new(INDICATOR_USERS_DBUS_NAME, INDICATOR_USERS_DBUS_OBJECT);
-	g_signal_connect(G_OBJECT(users_client), DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED, G_CALLBACK(users_menu_root_changed), main_menu);
-
-	users_separator = gtk_separator_menu_item_new();
-	gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), users_separator);
-	gtk_widget_hide(users_separator); /* Should be default, I'm just being explicit.  $(%*#$ hide already!  */
-
-	return;
-}
-
-/* Session Menu Stuff */
-
-static guint
-session_menu_pos_offset (void)
-{
-	guint position = 0;
-	if (SEPARATOR_SHOWN(users_separator)) {
-		GList * location = g_list_find(GTK_MENU_SHELL(main_menu)->children, users_separator);
-		position = g_list_position(GTK_MENU_SHELL(main_menu)->children, location) + 1;
-	} else if (SEPARATOR_SHOWN(status_separator)) {
-		GList * location = g_list_find(GTK_MENU_SHELL(main_menu)->children, status_separator);
-		position = g_list_position(GTK_MENU_SHELL(main_menu)->children, location) + 1;
-	}
-
-	return position;
-}
-
-static void
-session_menu_removed (DbusmenuMenuitem * root, DbusmenuMenuitem * child, gpointer user_data)
-{
-	return;
-}
-
-static void
-session_menu_root_changed(DbusmenuGtkClient * client, DbusmenuMenuitem * newroot, GtkMenu * main)
-{
-	if (newroot == NULL) {
-		/* We're assuming this'll crash the least so it doesn't
-		   hide a separator.  May be a bad choice. */
-		return;
-	}
-
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_ADDED,   G_CALLBACK(child_added),           GUINT_TO_POINTER(SESSION_SECTION));
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_REMOVED, G_CALLBACK(session_menu_removed),  NULL);
-	g_signal_connect(G_OBJECT(newroot), DBUSMENU_MENUITEM_SIGNAL_CHILD_MOVED,   G_CALLBACK(child_moved),           GUINT_TO_POINTER(SESSION_SECTION));
-
-	GList * child = NULL;
-	guint count = 0;
-	for (child = dbusmenu_menuitem_get_children(newroot); child != NULL; child = g_list_next(child), count++) {
-		child_added(newroot, DBUSMENU_MENUITEM(child->data), count, GUINT_TO_POINTER(SESSION_SECTION));
-	}
-
-	return;
-}
-
-/* Follow up the service being started by connecting
-   up the DBus Menu Client. */
-static void
-session_followup (void)
-{
-	session_client = dbusmenu_gtkclient_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT);
-	g_signal_connect(G_OBJECT(session_client), DBUSMENU_GTKCLIENT_SIGNAL_ROOT_CHANGED, G_CALLBACK(session_menu_root_changed), main_menu);
-
-	return;
-}
-
-/* Base menu stuff */
-
-/* This takes the response to the service starting up.
-   It checks to see if it's started and if so, continues
-   with the follow function for the particular area that
-   it's working in. */
-static void
-start_service_phase2 (DBusGProxy * proxy, guint status, GError * error, gpointer data)
-{
-	/* If we've got an error respond to it */
-	if (error != NULL) {
-		g_critical("Starting service has resulted in error.");
-		g_error_free(error);
-		/* Try it all again, we need to get this started! */
-		g_idle_add(start_service, data);
-		return;
-	}
-
-	/* If it's not running or we started it, try again */
-	if (status != DBUS_START_REPLY_SUCCESS && status != DBUS_START_REPLY_ALREADY_RUNNING) {
-		g_critical("Return value isn't indicative of success: %d", status);
-		/* Try it all again, we need to get this started! */
-		g_idle_add(start_service, data);
-		return;
-	}
-
-	/* Check which part of the menu we're in and do the
-	   appropriate follow up from the service being started. */
-	switch (GPOINTER_TO_INT(data)) {
-	case STATUS_SECTION:
-		status_followup();
-		break;
-	case USERS_SECTION:
-		users_followup();
-		break;
-	case SESSION_SECTION:
-		session_followup();
-		break;
-	default:
-		g_critical("Oh, how can we get a value that we don't know!");
-		break;
-	}
-
-	return;
-}
-
-/* Our idle service starter.  It looks at the section that
-   we're doing and then asks async for that service to be
-   started by dbus.  Probably not really useful to be in
-   the idle loop as it's so quick, but why not. */
-static gboolean
-start_service (gpointer userdata)
-{
-	g_debug("Starting a service");
-
-	if (proxy == NULL) {
-		/* If we don't have DBus, let's stay in the idle loop */
-		return TRUE;
-	}
-
-	const gchar * service = NULL;
-	switch (GPOINTER_TO_INT(userdata)) {
-	case STATUS_SECTION:
-		service = INDICATOR_STATUS_DBUS_NAME;
-		break;
-	case USERS_SECTION:
-		service = INDICATOR_USERS_DBUS_NAME;
-		break;
-	case SESSION_SECTION:
-		service = INDICATOR_SESSION_DBUS_NAME;
-		break;
-	default:
-		g_critical("Oh, how can we get a value that we don't know!");
-		return FALSE;
-	}
-
-	org_freedesktop_DBus_start_service_by_name_async (proxy, service, 0 /* Flags */, start_service_phase2, userdata);
-
-	return FALSE;
-}
-
-/* Indicator based function to get the menu for the whole
-   applet.  This starts up asking for the parts of the menu
-   from the various services. */
+		org_ayatana_indicator_me_service_status_icons_async(status_proxy, status_icon_cb, NULL);
+	} else {
+		/* If we're disconnecting, go back to offline */
+		status_icon_cb(NULL, DEFAULT_ICON, NULL, NULL);
+	}
+
+	return;
+}
+
+/* Builds the dbusmenu for the service. */
 static GtkMenu *
 get_menu (IndicatorObject * io)
 {
-	connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-	if (proxy == NULL) {
-		g_warning("Unable to get proxy for DBus itself.  Seriously.");
-	}
-
-	/* Startup in the idle loop */
-	g_idle_add(start_service, GINT_TO_POINTER(STATUS_SECTION));
-	g_idle_add(start_service, GINT_TO_POINTER(USERS_SECTION));
-	g_idle_add(start_service, GINT_TO_POINTER(SESSION_SECTION));
-
-	/* Build a temp menu incase someone can ask for it
-	   before the services start.  Fast user! */
-	main_menu = GTK_MENU(gtk_menu_new());
-	loading_item = gtk_menu_item_new_with_label("Loading...");
-	gtk_menu_shell_append(GTK_MENU_SHELL(main_menu), loading_item);
-	gtk_widget_show(GTK_WIDGET(loading_item));
-
-	return main_menu;
+	return GTK_MENU(dbusmenu_gtkmenu_new(INDICATOR_ME_DBUS_NAME, INDICATOR_ME_DBUS_OBJECT));
 }
 
 

=== removed file 'src/lock-helper.c'
--- src/lock-helper.c	2009-10-07 17:10:38 +0000
+++ src/lock-helper.c	1970-01-01 00:00:00 +0000
@@ -1,326 +0,0 @@
-/*
-A small helper for locking the screen.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <dbus/dbus-glib.h>
-#include "lock-helper.h"
-
-static DBusGProxy * gss_proxy = NULL;
-static GMainLoop * gss_mainloop = NULL;
-static guint cookie = 0;
-static DBusGProxyCall * cookie_call = NULL;
-
-static DBusGProxy * gdm_settings_proxy = NULL;
-static gboolean gdm_auto_login = FALSE;
-static const gchar * gdm_auto_login_string = "daemon/AutomaticLoginEnable";
-
-static gboolean is_guest = FALSE;
-
-static gdm_autologin_cb_t gdm_autologin_cb = NULL;
-
-/* Checks to see if there is an error and reports
-   it.  Not much else we can do. */
-static void
-unthrottle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	GError * error = NULL;
-	dbus_g_proxy_end_call(proxy, call, &error,
-	                      G_TYPE_INVALID);
-
-	if (error != NULL) {
-		g_warning("Unable to unthrottle: %s", error->message);
-	}
-	return;
-}
-
-/* Sends an unthrottle if we're throttled. */
-void
-screensaver_unthrottle (void)
-{
-	g_return_if_fail(cookie != 0);
-
-	dbus_g_proxy_begin_call(gss_proxy, "UnThrottle",
-	                        unthrottle_return, NULL,
-	                        NULL,
-	                        G_TYPE_UINT, cookie,
-	                        G_TYPE_INVALID);
-
-	cookie = 0;
-	return;
-}
-
-/* Gets there return cookie from the throttle command
-   and sets things valid */
-static void
-throttle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	GError * error = NULL;
-	cookie_call = NULL;
-
-	dbus_g_proxy_end_call(proxy, call, &error,
-	                      G_TYPE_UINT, &cookie,
-	                      G_TYPE_INVALID);
-
-	if (error != NULL) {
-		g_warning("Unable to throttle the screensaver: %s", error->message);
-		return;
-	}
-
-
-	if (cookie == 0) {
-		g_warning("We didn't get a throttle cookie!");
-	}
-
-	return;
-}
-
-/* Throttling the screensaver by using the screen saver
-   command. */
-void
-screensaver_throttle (gchar * reason)
-{
-	g_return_if_fail(cookie_call == NULL);
-	g_return_if_fail(will_lock_screen());
-
-	if (cookie != 0) {
-		screensaver_unthrottle();
-	}
-
-	cookie_call = dbus_g_proxy_begin_call(gss_proxy, "Throttle",
-	                                      throttle_return, NULL,
-	                                      NULL,
-	                                      G_TYPE_STRING, "Session Menu",
-	                                      G_TYPE_STRING, reason,
-	                                      G_TYPE_INVALID);
-
-	return;
-}
-
-/* Setting up a call back */
-void
-lock_screen_gdm_cb_set (gdm_autologin_cb_t cb)
-{
-	if (gdm_autologin_cb) {
-		g_warning("Already had a callback, setting up a new one...");
-	}
-
-	gdm_autologin_cb = cb;
-	return;
-}
-
-/* This is our logic on whether the screen should be locked
-   or not.  It effects everything else. */
-gboolean
-will_lock_screen (void)
-{
-	if (gdm_auto_login) {
-		return FALSE;
-	}
-	if (is_guest) {
-		return FALSE;
-	}
-
-	return TRUE;
-}
-
-/* Respond to the signal of autologin changing to see if the
-   setting for timed login changes. */
-static void
-gdm_settings_change (DBusGProxy * proxy, const gchar * value, const gchar * old, const gchar * new, gpointer data)
-{
-	if (g_strcmp0(value, gdm_auto_login_string)) {
-		/* This is not a setting that we care about,
-		   there is only one. */
-		return;
-	}
-	g_debug("GDM Settings change: %s", new);
-
-	if (g_strcmp0(new, "true") == 0) {
-		gdm_auto_login = TRUE;
-	} else {
-		gdm_auto_login = FALSE;
-	}
-
-	if (gdm_autologin_cb != NULL) {
-		gdm_autologin_cb();
-	}
-
-	return;
-}
-
-/* Get back the data from querying to see if there is auto
-   login enabled in GDM */
-static void
-gdm_get_autologin (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	GError * error = NULL;
-	gchar * value = NULL;
-
-	if (!dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_STRING, &value, G_TYPE_INVALID)) {
-		g_warning("Unable to get autologin setting: %s", error != NULL ? error->message : "null");
-		g_error_free(error);
-		return;
-	}
-
-	g_return_if_fail(value != NULL);
-	gdm_settings_change(proxy, gdm_auto_login_string, NULL, value, NULL);
-
-	return;
-}
-
-/* Sets up the proxy and queries for the setting to know
-   whether we're doing an autologin. */
-static void
-build_gdm_proxy (void)
-{
-	g_return_if_fail(gdm_settings_proxy == NULL);
-
-	/* Grab the system bus */
-	DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
-	g_return_if_fail(bus != NULL);
-
-	/* Get the settings proxy */
-	gdm_settings_proxy = dbus_g_proxy_new_for_name_owner(bus,
-	                                                     "org.gnome.DisplayManager",
-	                                                     "/org/gnome/DisplayManager/Settings",
-	                                                     "org.gnome.DisplayManager.Settings", NULL);
-	g_return_if_fail(gdm_settings_proxy != NULL);
-
-	/* Signal for value changed */
-	dbus_g_proxy_add_signal(gdm_settings_proxy,
-	                        "ValueChanged",
-	                        G_TYPE_STRING,
-	                        G_TYPE_STRING,
-	                        G_TYPE_STRING,
-	                        G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal(gdm_settings_proxy,
-	                            "ValueChanged",
-	                            G_CALLBACK(gdm_settings_change),
-	                            NULL,
-	                            NULL);
-
-	/* Start to get the initial value */
-	dbus_g_proxy_begin_call(gdm_settings_proxy,
-	                        "GetValue",
-	                        gdm_get_autologin,
-	                        NULL,
-	                        NULL,
-	                        G_TYPE_STRING,
-	                        gdm_auto_login_string,
-	                        G_TYPE_INVALID);
-
-	return;
-}
-
-/* When the screensave go active, if we've got a mainloop
-   running we should quit it. */
-static void
-gss_active_changed (DBusGProxy * proxy, gboolean active, gpointer data)
-{
-	if (active && gss_mainloop != NULL) {
-		g_main_loop_quit(gss_mainloop);
-	}
-
-	return;
-}
-
-/* Build the gss proxy and set up it's signals */
-void
-build_gss_proxy (void)
-{
-	DBusGConnection * session_bus = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-	g_return_if_fail(session_bus != NULL);
-
-	gss_proxy = dbus_g_proxy_new_for_name_owner(session_bus,
-	                                            "org.gnome.ScreenSaver",
-	                                            "/",
-	                                            "org.gnome.ScreenSaver",
-	                                            NULL);
-	g_return_if_fail(gss_proxy != NULL);
-
-	dbus_g_proxy_add_signal(gss_proxy, "ActiveChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID);
-	dbus_g_proxy_connect_signal(gss_proxy, "ActiveChanged", G_CALLBACK(gss_active_changed), NULL, NULL);
-
-	return;
-}
-
-/* This is a timeout, we only want to wait for the screen to
-   lock for a little bit, but not forever. */
-static gboolean
-activate_timeout (gpointer data)
-{
-	guint * address = (guint *)data;
-	*address = 0;
-
-	if (gss_mainloop != NULL) {
-		g_main_loop_quit(gss_mainloop);
-	}
-	
-	return FALSE;
-}
-
-/* A fun little function to actually lock the screen.  If,
-   that's what you want, let's do it! */
-void
-lock_screen (DbusmenuMenuitem * mi, gpointer data)
-{
-	g_debug("Lock Screen");
-	if (!will_lock_screen()) {
-		g_debug("\tGDM set to autologin, blocking lock");
-		return;
-	}
-
-	g_return_if_fail(gss_proxy != NULL);
-
-	dbus_g_proxy_call_no_reply(gss_proxy,
-	                           "Lock",
-	                           G_TYPE_INVALID,
-	                           G_TYPE_INVALID);
-
-	if (gss_mainloop == NULL) {
-		gss_mainloop = g_main_loop_new(NULL, FALSE);
-	}
-
-	guint timer = g_timeout_add_seconds(1, activate_timeout, &timer);
-
-	g_main_loop_run(gss_mainloop);
-
-	if (timer != 0) {
-		g_source_remove(timer);
-	}
-
-	return;
-}
-
-/* Do what it takes to make the lock screen function work
-   and be happy. */
-gboolean
-lock_screen_setup (gpointer data)
-{
-	if (!g_strcmp0(g_get_user_name(), "guest")) {
-		is_guest = TRUE;
-	}
-
-	build_gdm_proxy();
-	build_gss_proxy();
-
-	return FALSE;
-}
-

=== removed file 'src/lock-helper.h'
--- src/lock-helper.h	2009-10-07 15:57:52 +0000
+++ src/lock-helper.h	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-/*
-A small helper for locking the screen.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef LOCK_HELPER_H__
-#define LOCK_HELPER_H__
-
-#include <libdbusmenu-glib/menuitem.h>
-
-typedef void (*gdm_autologin_cb_t) (void);
-
-void screensaver_throttle (gchar * reason);
-void screensaver_unthrottle (void);
-
-gboolean will_lock_screen (void);
-void lock_screen (DbusmenuMenuitem * mi, gpointer data);
-gboolean lock_screen_setup (gpointer data);
-void lock_screen_gdm_cb_set (gdm_autologin_cb_t cb);
-
-#endif /* LOCK_HELPER_H__ */

=== renamed file 'src/status-service-dbus.c' => 'src/me-service-dbus.c'
--- src/status-service-dbus.c	2009-08-08 20:54:51 +0000
+++ src/me-service-dbus.c	2010-01-04 21:25:21 +0000
@@ -27,17 +27,17 @@
 #include <dbus/dbus-glib.h>
 
 #include "dbus-shared-names.h"
-#include "status-service-dbus.h"
+#include "me-service-dbus.h"
 
 static void status_service_dbus_class_init (StatusServiceDbusClass *klass);
 static void status_service_dbus_init       (StatusServiceDbus *self);
 static void status_service_dbus_dispose    (GObject *object);
 static void status_service_dbus_finalize   (GObject *object);
-static gboolean _status_service_server_watch (StatusServiceDbus * service, GError ** error);
-static gboolean _status_service_server_status_icons (StatusServiceDbus * service, gchar ** icon, GError ** error);
-static gboolean _status_service_server_pretty_user_name (StatusServiceDbus * service, gchar ** username, GError ** error);
+static gboolean _me_service_server_watch (StatusServiceDbus * service, GError ** error);
+static gboolean _me_service_server_status_icons (StatusServiceDbus * service, gchar ** icon, GError ** error);
+static gboolean _me_service_server_pretty_user_name (StatusServiceDbus * service, gchar ** username, GError ** error);
 
-#include "status-service-server.h"
+#include "me-service-server.h"
 
 /* Private */
 typedef struct _StatusServiceDbusPrivate StatusServiceDbusPrivate;
@@ -106,7 +106,7 @@
 	                                             g_cclosure_marshal_VOID__STRING,
 	                                             G_TYPE_NONE, 1, G_TYPE_STRING);
 
-	dbus_g_object_type_install_info(STATUS_SERVICE_DBUS_TYPE, &dbus_glib__status_service_server_object_info);
+	dbus_g_object_type_install_info(STATUS_SERVICE_DBUS_TYPE, &dbus_glib__me_service_server_object_info);
 	
 	return;
 }
@@ -117,7 +117,7 @@
 
 	DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
 	dbus_g_connection_register_g_object(connection,
-										INDICATOR_STATUS_SERVICE_DBUS_OBJECT,
+										INDICATOR_ME_SERVICE_DBUS_OBJECT,
 										G_OBJECT(self));
 
 	StatusServiceDbusPrivate * priv = STATUS_SERVICE_DBUS_GET_PRIVATE(self);
@@ -144,14 +144,14 @@
 }
 
 static gboolean
-_status_service_server_watch (StatusServiceDbus * service, GError ** error)
+_me_service_server_watch (StatusServiceDbus * service, GError ** error)
 {
 
 	return TRUE;
 }
 
 static gboolean
-_status_service_server_status_icons (StatusServiceDbus * service, gchar ** icon, GError ** error)
+_me_service_server_status_icons (StatusServiceDbus * service, gchar ** icon, GError ** error)
 {
 	if (!IS_STATUS_SERVICE_DBUS(service)) {
 		g_warning("NO BAD EVIL!");
@@ -169,7 +169,7 @@
 }
 
 static gboolean
-_status_service_server_pretty_user_name (StatusServiceDbus * service, gchar ** username, GError ** error)
+_me_service_server_pretty_user_name (StatusServiceDbus * service, gchar ** username, GError ** error)
 {
 	if (!IS_STATUS_SERVICE_DBUS(service)) {
 		g_warning("NO BAD EVIL!");

=== renamed file 'src/status-service-dbus.h' => 'src/me-service-dbus.h'
=== renamed file 'src/status-service.c' => 'src/me-service.c'
--- src/status-service.c	2009-10-06 22:51:09 +0000
+++ src/me-service.c	2010-01-04 21:25:21 +0000
@@ -35,9 +35,11 @@
 #include <libdbusmenu-glib/server.h>
 #include <libdbusmenu-glib/menuitem.h>
 
+#include <libindicator/indicator-service.h>
+
 #include "dbus-shared-names.h"
 
-#include "status-service-dbus.h"
+#include "me-service-dbus.h"
 
 #include "status-provider.h"
 #include "status-provider-mc5.h"
@@ -73,7 +75,6 @@
 
 
 static DbusmenuMenuitem * root_menuitem = NULL;
-static DbusmenuMenuitem * status_menuitem = NULL;
 static DbusmenuMenuitem * status_menuitems[STATUS_PROVIDER_STATUS_LAST] = {0};
 static GMainLoop * mainloop = NULL;
 static StatusServiceDbus * dbus_interface = NULL;
@@ -107,7 +108,7 @@
 			StatusProviderStatus i;
 			for (i = STATUS_PROVIDER_STATUS_ONLINE; i < STATUS_PROVIDER_STATUS_LAST; i++) {
 				if (status_menuitems[i] == NULL) continue;
-				dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, "false");
+				dbusmenu_menuitem_property_set_bool(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, FALSE);
 			}
 		}
 
@@ -117,7 +118,7 @@
 			StatusProviderStatus i;
 			for (i = STATUS_PROVIDER_STATUS_ONLINE; i < STATUS_PROVIDER_STATUS_LAST; i++) {
 				if (status_menuitems[i] == NULL) continue;
-				dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, "true");
+				dbusmenu_menuitem_property_set_bool(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, TRUE);
 			}
 		}
 	}
@@ -171,7 +172,7 @@
 		if (name[0] != '\0') {
 			DbusmenuMenuitem * useritem = dbusmenu_menuitem_new();
 			dbusmenu_menuitem_property_set(useritem, DBUSMENU_MENUITEM_PROP_LABEL, name);
-			dbusmenu_menuitem_property_set(useritem, DBUSMENU_MENUITEM_PROP_SENSITIVE, "false");
+			dbusmenu_menuitem_property_set_bool(useritem, DBUSMENU_MENUITEM_PROP_SENSITIVE, FALSE);
 			dbusmenu_menuitem_child_append(root, useritem);
 		}
 
@@ -191,10 +192,6 @@
 
 	build_user_item(root);
 
-	status_menuitem = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(status_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, _("Set Status"));
-	dbusmenu_menuitem_child_append(root, status_menuitem);
-
 	StatusProviderStatus i;
 	for (i = STATUS_PROVIDER_STATUS_ONLINE; i < STATUS_PROVIDER_STATUS_LAST; i++) {
 		if (i == STATUS_PROVIDER_STATUS_DISCONNECTED) {
@@ -205,15 +202,14 @@
 
 		status_menuitems[i] = dbusmenu_menuitem_new();
 
-		dbusmenu_menuitem_property_set(status_menuitems[i], "type", DBUSMENU_CLIENT_TYPES_IMAGE);
 		dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_LABEL, _(status_strings[i]));
 		dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_ICON, status_icons[i]);
 		if (global_status == STATUS_PROVIDER_STATUS_DISCONNECTED) {
-			dbusmenu_menuitem_property_set(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, "false");
+			dbusmenu_menuitem_property_set_bool(status_menuitems[i], DBUSMENU_MENUITEM_PROP_SENSITIVE, FALSE);
 		}
 		g_signal_connect(G_OBJECT(status_menuitems[i]), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(status_menu_click), GINT_TO_POINTER(i));
 
-		dbusmenu_menuitem_child_append(status_menuitem, status_menuitems[i]);
+		dbusmenu_menuitem_child_append(root, status_menuitems[i]);
 
 		g_debug("Built %s", status_strings[i]);
 	}
@@ -221,6 +217,14 @@
 	return FALSE;
 }
 
+void
+service_shutdown (IndicatorService * service, gpointer user_data)
+{
+	g_debug("Service shutting down");
+	g_main_loop_quit(mainloop);
+	return;
+}
+
 int
 main (int argc, char ** argv)
 {
@@ -232,25 +236,13 @@
 	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
 	textdomain (GETTEXT_PACKAGE);
 
-    DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-    GError * error = NULL;
-    guint nameret = 0;
-
-    if (!org_freedesktop_DBus_request_name(bus_proxy, INDICATOR_STATUS_DBUS_NAME, 0, &nameret, &error)) {
-        g_error("Unable to call to request name");
-        return 1;
-    }
-
-    if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-        g_error("Unable to get name");
-        return 1;
-    }
+	IndicatorService * service = indicator_service_new_version(INDICATOR_ME_DBUS_NAME, INDICATOR_ME_DBUS_VERSION);
+	g_signal_connect(G_OBJECT(service), INDICATOR_SERVICE_SIGNAL_SHUTDOWN, G_CALLBACK(service_shutdown), NULL);
 
 	g_idle_add(build_providers, NULL);
 
     root_menuitem = dbusmenu_menuitem_new();
-    DbusmenuServer * server = dbusmenu_server_new(INDICATOR_STATUS_DBUS_OBJECT);
+    DbusmenuServer * server = dbusmenu_server_new(INDICATOR_ME_DBUS_OBJECT);
     dbusmenu_server_set_root(server, root_menuitem);
 
 	g_idle_add(build_menu, root_menuitem);

=== renamed file 'src/status-service.xml' => 'src/me-service.xml'
--- src/status-service.xml	2009-08-08 16:47:24 +0000
+++ src/me-service.xml	2010-01-04 21:25:21 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <node name="/">
-	<interface name="org.ayatana.indicator.status.service">
+	<interface name="org.ayatana.indicator.me.service">
 
 <!-- Methods -->
 		<method name="Watch">

=== removed file 'src/session-service.c'
--- src/session-service.c	2009-10-07 16:56:05 +0000
+++ src/session-service.c	1970-01-01 00:00:00 +0000
@@ -1,339 +0,0 @@
-/*
-A small wrapper utility to load indicators and put them as menu items
-into the gnome-panel using it's applet interface.
-
-Copyright 2009 Canonical Ltd.
-
-Authors:
-    Ted Gould <[e-mail]>
-    Christoph Korn <[e-mail]>
-
-This program is free software: you can redistribute it and/or modify it 
-under the terms of the GNU General Public License version 3, as published 
-by the Free Software Foundation.
-
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranties of 
-MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR 
-PURPOSE.  See the GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License along 
-with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <config.h>
-
-#include <glib/gi18n.h>
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-bindings.h>
-
-#include <libdbusmenu-glib/server.h>
-#include <libdbusmenu-glib/menuitem.h>
-
-#include "dbus-shared-names.h"
-
-#include "gtk-dialog/gconf-helper.h"
-
-#include "lock-helper.h"
-
-#define DKP_ADDRESS    "org.freedesktop.DeviceKit.Power"
-#define DKP_OBJECT     "/org/freedesktop/DeviceKit/Power"
-#define DKP_INTERFACE  "org.freedesktop.DeviceKit.Power"
-
-static DbusmenuMenuitem * root_menuitem = NULL;
-static GMainLoop * mainloop = NULL;
-static DBusGProxy * dkp_main_proxy = NULL;
-static DBusGProxy * dkp_prop_proxy = NULL;
-
-static DBusGProxyCall * suspend_call = NULL;
-static DBusGProxyCall * hibernate_call = NULL;
-
-static DbusmenuMenuitem * hibernate_mi = NULL;
-static DbusmenuMenuitem * suspend_mi = NULL;
-static DbusmenuMenuitem * logout_mi = NULL;
-static DbusmenuMenuitem * restart_mi = NULL;
-static DbusmenuMenuitem * shutdown_mi = NULL;
-
-/* A return from the command to sleep the system.  Make sure
-   that we unthrottle the screensaver. */
-static void
-sleep_response (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
-{
-	screensaver_unthrottle();
-	return;
-}
-
-/* Let's put this machine to sleep, with some info on how
-   it should sleep.  */
-static void
-sleep (DbusmenuMenuitem * mi, gpointer userdata)
-{
-	gchar * type = (gchar *)userdata;
-
-	if (dkp_main_proxy == NULL) {
-		g_warning("Can not %s as no DeviceKit Power Proxy", type);
-	}
-
-	screensaver_throttle(type);
-	lock_screen(NULL, NULL);
-
-	dbus_g_proxy_begin_call(dkp_main_proxy,
-	                        type,
-	                        sleep_response,
-	                        NULL,
-	                        NULL,
-	                        G_TYPE_INVALID);
-
-	return;
-}
-
-/* A response to getting the suspend property */
-static void
-suspend_prop_cb (DBusGProxy * proxy, DBusGProxyCall * call, gpointer userdata)
-{
-	suspend_call = NULL;
-
-	GValue candoit = {0};
-	GError * error = NULL;
-	dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &candoit, G_TYPE_INVALID);
-	if (error != NULL) {
-		g_warning("Unable to check suspend: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	g_debug("Got Suspend: %s", g_value_get_boolean(&candoit) ? "true" : "false");
-
-	if (suspend_mi != NULL) {
-		dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, g_value_get_boolean(&candoit) ? "true" : "false");
-	}
-
-	return;
-}
-
-/* Response to getting the hibernate property */
-static void
-hibernate_prop_cb (DBusGProxy * proxy, DBusGProxyCall * call, gpointer userdata)
-{
-	hibernate_call = NULL;
-
-	GValue candoit = {0};
-	GError * error = NULL;
-	dbus_g_proxy_end_call(proxy, call, &error, G_TYPE_VALUE, &candoit, G_TYPE_INVALID);
-	if (error != NULL) {
-		g_warning("Unable to check hibernate: %s", error->message);
-		g_error_free(error);
-		return;
-	}
-	g_debug("Got Hibernate: %s", g_value_get_boolean(&candoit) ? "true" : "false");
-
-	if (suspend_mi != NULL) {
-		dbusmenu_menuitem_property_set(hibernate_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, g_value_get_boolean(&candoit) ? "true" : "false");
-	}
-
-	return;
-}
-
-/* A signal that we need to recheck to ensure we can still
-   hibernate and/or suspend */
-static void
-dpk_changed_cb (DBusGProxy * proxy, gpointer user_data)
-{
-	/* Start Async call to see if we can hibernate */
-	if (suspend_call == NULL) {
-		suspend_call = dbus_g_proxy_begin_call(dkp_prop_proxy,
-		                                       "Get",
-		                                       suspend_prop_cb,
-		                                       NULL,
-		                                       NULL,
-		                                       G_TYPE_STRING,
-		                                       DKP_INTERFACE,
-		                                       G_TYPE_STRING,
-		                                       "can-suspend",
-		                                       G_TYPE_INVALID,
-		                                       G_TYPE_VALUE,
-		                                       G_TYPE_INVALID);
-	}
-
-	/* Start Async call to see if we can suspend */
-	if (hibernate_call == NULL) {
-		hibernate_call = dbus_g_proxy_begin_call(dkp_prop_proxy,
-		                                         "Get",
-		                                         hibernate_prop_cb,
-		                                         NULL,
-		                                         NULL,
-		                                         G_TYPE_STRING,
-		                                         DKP_INTERFACE,
-		                                         G_TYPE_STRING,
-		                                         "can-hibernate",
-		                                         G_TYPE_INVALID,
-		                                         G_TYPE_VALUE,
-		                                         G_TYPE_INVALID);
-	}
-
-	return;
-}
-
-/* This function goes through and sets up what we need for
-   DKp checking.  We're even setting up the calls for the props
-   we need */
-static void
-setup_dkp (void) {
-	DBusGConnection * bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
-	g_return_if_fail(bus != NULL);
-
-	if (dkp_main_proxy == NULL) {
-		dkp_main_proxy = dbus_g_proxy_new_for_name(bus,
-		                                           DKP_ADDRESS,
-		                                           DKP_OBJECT,
-		                                           DKP_INTERFACE);
-	}
-	g_return_if_fail(dkp_main_proxy != NULL);
-
-	if (dkp_prop_proxy == NULL) {
-		dkp_prop_proxy = dbus_g_proxy_new_for_name(bus,
-		                                           DKP_ADDRESS,
-		                                           DKP_OBJECT,
-		                                           DBUS_INTERFACE_PROPERTIES);
-	}
-	g_return_if_fail(dkp_prop_proxy != NULL);
-
-	/* Connect to changed signal */
-	dbus_g_proxy_add_signal(dkp_main_proxy,
-	                        "Changed",
-	                        G_TYPE_INVALID);
-
-	dbus_g_proxy_connect_signal(dkp_main_proxy,
-	                            "Changed",
-	                            G_CALLBACK(dpk_changed_cb),
-	                            NULL,
-	                            NULL);
-
-	/* Force an original "changed" event */
-	dpk_changed_cb(dkp_main_proxy, NULL);
-
-	return;
-}
-
-/* This is the function to show a dialog on actions that
-   can destroy data.  Currently it just calls the GTK version
-   but it seems that in the future it should figure out
-   what's going on and something better. */
-static void
-show_dialog (DbusmenuMenuitem * mi, gchar * type)
-{
-	gchar * helper = g_build_filename(LIBEXECDIR, "gtk-logout-helper", NULL);
-	gchar * dialog_line = g_strdup_printf("%s --%s", helper, type);
-	g_free(helper);
-
-	g_debug("Showing dialog '%s'", dialog_line);
-
-	GError * error = NULL;
-	if (!g_spawn_command_line_async(dialog_line, &error)) {
-		g_warning("Unable to show dialog: %s", error->message);
-		g_error_free(error);
-	}
-
-	g_free(dialog_line);
-
-	return;
-}
-
-/* This function creates all of the menuitems that the service
-   provides in the UI.  It also connects them to the callbacks. */
-static void
-create_items (DbusmenuMenuitem * root) {
-	logout_mi = dbusmenu_menuitem_new();
-	if (supress_confirmations()) {
-		dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out"));
-	} else {
-		dbusmenu_menuitem_property_set(logout_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Log Out..."));
-	}
-	dbusmenu_menuitem_child_append(root, logout_mi);
-	g_signal_connect(G_OBJECT(logout_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "logout");
-
-	suspend_mi = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, "false");
-	dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Suspend"));
-	dbusmenu_menuitem_child_append(root, suspend_mi);
-	g_signal_connect(G_OBJECT(suspend_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(sleep), "Suspend");
-
-	hibernate_mi = dbusmenu_menuitem_new();
-	dbusmenu_menuitem_property_set(hibernate_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, "false");
-	dbusmenu_menuitem_property_set(hibernate_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Hibernate"));
-	dbusmenu_menuitem_child_append(root, hibernate_mi);
-	g_signal_connect(G_OBJECT(hibernate_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(sleep), "Hibernate");
-
-	restart_mi = dbusmenu_menuitem_new();
-	if (supress_confirmations()) {
-		dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart"));
-	} else {
-		dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart..."));
-	}
-	dbusmenu_menuitem_child_append(root, restart_mi);
-	g_signal_connect(G_OBJECT(restart_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "restart");
-
-	shutdown_mi = dbusmenu_menuitem_new();
-	if (supress_confirmations()) {
-		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
-	} else {
-		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
-	}
-	dbusmenu_menuitem_child_append(root, shutdown_mi);
-	g_signal_connect(G_OBJECT(shutdown_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown");
-
-	RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = g_new0 (RestartShutdownLogoutMenuItems, 1);
-	restart_shutdown_logout_mi->logout_mi = logout_mi;
-	restart_shutdown_logout_mi->restart_mi = restart_mi;
-	restart_shutdown_logout_mi->shutdown_mi = shutdown_mi;
-
-	update_menu_entries(restart_shutdown_logout_mi);
-
-	return;
-}
-
-/* Main, is well, main.  It brings everything up and throws
-   us into the mainloop of no return. */
-int
-main (int argc, char ** argv)
-{
-    g_type_init();
-
-	/* Setting up i18n and gettext.  Apparently, we need
-	   all of these. */
-	setlocale (LC_ALL, "");
-	bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
-	textdomain (GETTEXT_PACKAGE);
-
-    DBusGConnection * connection = dbus_g_bus_get(DBUS_BUS_SESSION, NULL);
-    DBusGProxy * bus_proxy = dbus_g_proxy_new_for_name(connection, DBUS_SERVICE_DBUS, DBUS_PATH_DBUS, DBUS_INTERFACE_DBUS);
-    GError * error = NULL;
-    guint nameret = 0;
-
-    if (!org_freedesktop_DBus_request_name(bus_proxy, INDICATOR_SESSION_DBUS_NAME, 0, &nameret, &error)) {
-        g_error("Unable to call to request name");
-        return 1;
-    }   
-
-    if (nameret != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) {
-        g_error("Unable to get name");
-        return 1;
-    }   
-
-	g_idle_add(lock_screen_setup, NULL);
-
-    root_menuitem = dbusmenu_menuitem_new();
-	g_debug("Root ID: %d", dbusmenu_menuitem_get_id(root_menuitem));
-
-	create_items(root_menuitem);
-	setup_dkp();
-
-    DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT);
-    dbusmenu_server_set_root(server, root_menuitem);
-
-    mainloop = g_main_loop_new(NULL, FALSE);
-    g_main_loop_run(mainloop);
-
-    return 0;
-}
-

=== modified file 'src/status-provider-mc5.c'
--- src/status-provider-mc5.c	2009-10-08 20:12:42 +0000
+++ src/status-provider-mc5.c	2010-01-04 21:25:21 +0000
@@ -24,7 +24,7 @@
 #include "config.h"
 #endif
 
-#include "libempathy/empathy-account-manager.h"
+#include <telepathy-glib/account-manager.h>
 
 #include "status-provider.h"
 #include "status-provider-mc5.h"
@@ -65,7 +65,7 @@
 
 typedef struct _StatusProviderMC5Private StatusProviderMC5Private;
 struct _StatusProviderMC5Private {
-	EmpathyAccountManager * manager;
+	TpAccountManager * manager;
 	StatusProviderStatus status;
 	DBusGProxy * dbus_proxy;
 };
@@ -83,7 +83,7 @@
 /* Internal Funcs */
 static void set_status (StatusProvider * sp, StatusProviderStatus status);
 static StatusProviderStatus get_status (StatusProvider * sp);
-static void presence_changed (EmpathyAccountManager * eam, guint type, const gchar * type_str, const gchar * message, StatusProviderMC5 * sp);
+static void presence_changed (TpAccountManager * eam, guint type, const gchar * type_str, const gchar * message, StatusProviderMC5 * sp);
 static void dbus_namechange (DBusGProxy * proxy, const gchar * name, const gchar * prev, const gchar * new, StatusProviderMC5 * self);
 static void mc5_exists_cb (DBusGProxy * proxy, gboolean exists, GError * error, gpointer userdata);
 
@@ -109,25 +109,41 @@
 	return;
 }
 
-/* Build our empathy account manager instance if we don't
+/* Build our telepathy account manager instance if we don't
    have one. */
 static void
 build_eam (StatusProviderMC5 * self)
 {
 	StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(self);
+	static TpDBusDaemon *daemon = NULL;
+	GError *error = NULL;
 
 	if (priv->manager != NULL) {
 		return;
 	}
-
-	priv->manager = EMPATHY_ACCOUNT_MANAGER(g_object_new(EMPATHY_TYPE_ACCOUNT_MANAGER, NULL));
-	g_signal_connect(G_OBJECT(priv->manager), "global-presence-changed", G_CALLBACK(presence_changed), self);
+	/* the daemon is used to communicate via DBus */
+	daemon = tp_dbus_daemon_dup(&error);
+
+	if (daemon == NULL)
+	{
+		g_debug("Cannot create DBus daemon: %s\n", error->message);
+		g_error_free(error);
+		return;
+	}
+
+	priv->manager = TP_ACCOUNT_MANAGER (g_object_new (TP_TYPE_ACCOUNT_MANAGER,
+		"dbus-daemon", daemon,
+		"dbus-connection", ((TpProxy *) daemon)->dbus_connection,
+		"bus-name", "org.freedesktop.Telepathy.MissionControl5",
+		"object-path", "/org/freedesktop/Telepathy/AccountManager",
+		NULL));
+	g_signal_connect(G_OBJECT(priv->manager), "most-available-presence-changed", G_CALLBACK(presence_changed), self);
 
 	return;
 }
 
 /* Creating an instance of the status provider.  We set the variables
-   and create an EmpathyAccountManager object.  It does all the hard
+   and create an TpAccountManager object.  It does all the hard
    work in this module of tracking MissionControl and enumerating the
    accounts and all that jazz. */
 static void
@@ -266,8 +282,7 @@
 	StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp);
 
 	build_eam(STATUS_PROVIDER_MC5(sp));
-
-	empathy_account_manager_request_global_presence(priv->manager, sp_to_tp_map[status], sp_to_mc_map[status], "");
+	tp_account_manager_set_all_requested_presences(priv->manager, sp_to_tp_map[status], sp_to_mc_map[status], "");
 
 	return;
 }
@@ -287,11 +302,11 @@
 	return priv->status;
 }
 
-/* A signal handler for when the EmpatyAccountManager believes
+/* A signal handler for when the TpAccountManager believes
    that the global status has changed.  It roughly calculates this
    by finding the most available of all accounts that are active. */
 static void
-presence_changed (EmpathyAccountManager * eam, guint type, const gchar * type_str, const gchar * message, StatusProviderMC5 * sp)
+presence_changed (TpAccountManager * eam, guint type, const gchar * type_str, const gchar * message, StatusProviderMC5 * sp)
 {
 	StatusProviderMC5Private * priv = STATUS_PROVIDER_MC5_GET_PRIVATE(sp);
 

=== removed file 'src/users-service-dbus.c'
--- src/users-service-dbus.c	2009-09-24 22:02:11 +0000
+++ src/users-service-dbus.c	1970-01-01 00:00:00 +0000
@@ -1,1147 +0,0 @@
-/*
- * Copyright 2009 Canonical Ltd.
- *
- * Authors:
- *     Cody Russell <[e-mail]>
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <string.h>
-#include <errno.h>
-#include <pwd.h>
-
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib.h>
-#include <dbus/dbus-glib-lowlevel.h>
-
-#include "dbus-shared-names.h"
-#include "users-service-dbus.h"
-#include "users-service-client.h"
-#include "users-service-marshal.h"
-
-static void     users_service_dbus_class_init         (UsersServiceDbusClass *klass);
-static void     users_service_dbus_init               (UsersServiceDbus  *self);
-static void     users_service_dbus_dispose            (GObject           *object);
-static void     users_service_dbus_finalize           (GObject           *object);
-static void     create_gdm_proxy                       (UsersServiceDbus  *self);
-static void     create_seat_proxy                      (UsersServiceDbus  *self);
-static void     create_ck_proxy                        (UsersServiceDbus *self);
-static void     create_cksession_proxy                 (UsersServiceDbus *self);
-static gchar   *get_seat                               (UsersServiceDbus *service);
-static void     users_loaded                           (DBusGProxy        *proxy,
-                                                        gpointer           user_data);
-static void     user_added                             (DBusGProxy        *proxy,
-                                                        gint64             uid,
-                                                        gpointer           user_data);
-static void     user_removed                           (DBusGProxy        *proxy,
-                                                        gint64             uid,
-                                                        gpointer           user_data);
-static void     user_updated                           (DBusGProxy        *proxy,
-                                                        guint              uid,
-                                                        gpointer           user_data);
-static void     seat_proxy_session_added               (DBusGProxy        *seat_proxy,
-                                                        const gchar       *session_id,
-                                                        UsersServiceDbus  *service);
-static void     seat_proxy_session_removed             (DBusGProxy        *seat_proxy,
-                                                        const gchar       *session_id,
-                                                        UsersServiceDbus  *service);
-static gboolean do_add_session                         (UsersServiceDbus  *service,
-                                                        UserData          *user,
-                                                        const gchar       *ssid);
-static gchar *  get_seat_internal                      (UsersServiceDbus  *self);
-
-/* Private */
-typedef struct _UsersServiceDbusPrivate UsersServiceDbusPrivate;
-
-struct _UsersServiceDbusPrivate
-{
-  GHashTable *users;
-  gint        count;
-  gchar      *seat;
-  gchar      *ssid;
-
-  DBusGConnection *system_bus;
-
-  DBusGProxy *gdm_proxy;
-  DBusGProxy *ck_proxy;
-  DBusGProxy *seat_proxy;
-  DBusGProxy *session_proxy;
-
-  GHashTable *exclusions;
-  GHashTable *sessions;
-};
-
-#define USERS_SERVICE_DBUS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), USERS_SERVICE_DBUS_TYPE, UsersServiceDbusPrivate))
-
-/* Signals */
-enum {
-  USERS_LOADED,
-  USER_ADDED,
-  USER_REMOVED,
-  USER_UPDATED,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-/* GObject Boilerplate */
-G_DEFINE_TYPE (UsersServiceDbus, users_service_dbus, G_TYPE_OBJECT);
-
-static void
-users_service_dbus_class_init (UsersServiceDbusClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  g_type_class_add_private (object_class, sizeof (UsersServiceDbusPrivate));
-
-  object_class->dispose = users_service_dbus_dispose;
-  object_class->finalize = users_service_dbus_finalize;
-
-  signals[USERS_LOADED] = g_signal_new ("users-loaded",
-                                        G_TYPE_FROM_CLASS (klass),
-                                        G_SIGNAL_RUN_LAST,
-                                        G_STRUCT_OFFSET (UsersServiceDbusClass, users_loaded),
-                                        NULL, NULL,
-                                        g_cclosure_marshal_VOID__VOID,
-                                        G_TYPE_NONE, 0);
-
-  signals[USER_ADDED] = g_signal_new ("user-added",
-                                      G_TYPE_FROM_CLASS (klass),
-                                      G_SIGNAL_RUN_LAST,
-                                      G_STRUCT_OFFSET (UsersServiceDbusClass, user_added),
-                                      NULL, NULL,
-                                      _users_service_marshal_VOID__INT64,
-                                      G_TYPE_NONE, 1, G_TYPE_INT64);
-
-  signals[USER_REMOVED] = g_signal_new ("user-removed",
-                                        G_TYPE_FROM_CLASS (klass),
-                                        G_SIGNAL_RUN_LAST,
-                                        G_STRUCT_OFFSET (UsersServiceDbusClass, user_removed),
-                                        NULL, NULL,
-                                        _users_service_marshal_VOID__INT64,
-                                        G_TYPE_NONE, 1, G_TYPE_INT64);
-
-  signals[USER_UPDATED] = g_signal_new ("user-updated",
-                                        G_TYPE_FROM_CLASS (klass),
-                                        G_SIGNAL_RUN_LAST,
-                                        G_STRUCT_OFFSET (UsersServiceDbusClass, user_updated),
-                                        NULL, NULL,
-                                        _users_service_marshal_VOID__INT64,
-                                        G_TYPE_NONE, 1, G_TYPE_INT64);
-}
-
-static void
-users_service_dbus_init (UsersServiceDbus *self)
-{
-  GError *error = NULL;
-  UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self);
-
-  priv->users = NULL;
-  priv->count = 0;
-
-  /* Get the system bus */
-  priv->system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
-  if (error != NULL)
-    {
-      g_error ("Unable to get system bus: %s", error->message);
-      g_error_free(error);
-
-      return;
-    }
-
-  priv->sessions = g_hash_table_new_full (g_str_hash,
-                                          g_str_equal,
-                                          g_free,
-                                          g_free);
-
-  priv->users = g_hash_table_new_full (g_str_hash,
-                                       g_str_equal,
-                                       g_free,
-                                       NULL);
-
-  dbus_g_object_register_marshaller (_users_service_marshal_VOID__INT64,
-                                     G_TYPE_NONE,
-                                     G_TYPE_INT64,
-                                     G_TYPE_INVALID);
-
-  create_gdm_proxy (self);
-  create_ck_proxy (self);
-  create_seat_proxy (self);
-
-  users_loaded (priv->gdm_proxy, self);
-}
-
-static void
-users_service_dbus_dispose (GObject *object)
-{
-  G_OBJECT_CLASS (users_service_dbus_parent_class)->dispose (object);
-}
-
-static void
-users_service_dbus_finalize (GObject *object)
-{
-  G_OBJECT_CLASS (users_service_dbus_parent_class)->finalize (object);
-}
-
-static void
-create_gdm_proxy (UsersServiceDbus *self)
-{
-  UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self);
-  GError *error = NULL;
-
-  priv->gdm_proxy = dbus_g_proxy_new_for_name_owner (priv->system_bus,
-                                                     "org.gnome.DisplayManager",
-                                                     "/org/gnome/DisplayManager/UserManager",
-                                                     "org.gnome.DisplayManager.UserManager",
-                                                     &error);
-
-  if (!priv->gdm_proxy)
-    {
-      if (error != NULL)
-        {
-          g_error ("Unable to get DisplayManager proxy on system bus: %s", error->message);
-          g_error_free (error);
-        }
-
-      return;
-    }
-
-  dbus_g_proxy_add_signal (priv->gdm_proxy,
-                           "UsersLoaded",
-                           G_TYPE_INVALID);
-
-  dbus_g_proxy_add_signal (priv->gdm_proxy,
-                           "UserAdded",
-                           G_TYPE_INT64,
-                           G_TYPE_INVALID);
-
-  dbus_g_proxy_add_signal (priv->gdm_proxy,
-                           "UserRemoved",
-                           G_TYPE_INT64,
-                           G_TYPE_INVALID);
-
-  dbus_g_proxy_add_signal (priv->gdm_proxy,
-                           "UserUpdated",
-                           G_TYPE_INT64,
-                           G_TYPE_INVALID);
-
-  dbus_g_proxy_connect_signal (priv->gdm_proxy,
-                               "UsersLoaded",
-                               G_CALLBACK (users_loaded),
-                               self,
-                               NULL);
-
-  dbus_g_proxy_connect_signal (priv->gdm_proxy,
-                               "UserAdded",
-                               G_CALLBACK (user_added),
-                               self,
-                               NULL);
-
-  dbus_g_proxy_connect_signal (priv->gdm_proxy,
-                               "UserRemoved",
-                               G_CALLBACK (user_removed),
-                               self,
-                               NULL);
-
-  dbus_g_proxy_connect_signal (priv->gdm_proxy,
-                               "UserUpdated",
-                               G_CALLBACK (user_updated),
-                               self,
-                               NULL);
-}
-
-static void
-create_ck_proxy (UsersServiceDbus *self)
-{
-  UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self);
-
-  priv->ck_proxy = dbus_g_proxy_new_for_name (priv->system_bus,
-                                              "org.freedesktop.ConsoleKit",
-                                              "/org/freedesktop/ConsoleKit/Manager",
-                                              "org.freedesktop.ConsoleKit.Manager");
-
-  if (!priv->ck_proxy)
-    {
-      g_warning ("Failed to get ConsoleKit proxy.");
-      return;
-    }
-}
-
-static void
-create_seat_proxy (UsersServiceDbus *self)
-{
-  UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self);
-  GError *error = NULL;
-
-  priv->seat = get_seat (self);
-  if (priv->seat == NULL)
-    {
-      return;
-    }
-
-  priv->seat_proxy = dbus_g_proxy_new_for_name_owner (priv->system_bus,
-                                                      "org.freedesktop.ConsoleKit",
-                                                      priv->seat,
-                                                      "org.freedesktop.ConsoleKit.Seat",
-                                                      &error);
-
-  if (!priv->seat_proxy)
-    {
-      if (error != NULL)
-        {
-          g_warning ("Failed to connect to the ConsoleKit seat: %s", error->message);
-          g_error_free (error);
-        }
-
-      return;
-    }
-
-  dbus_g_proxy_add_signal (priv->seat_proxy,
-                           "SessionAdded",
-                           DBUS_TYPE_G_OBJECT_PATH,
-                           G_TYPE_INVALID);
-  dbus_g_proxy_add_signal (priv->seat_proxy,
-                           "SessionRemoved",
-                           DBUS_TYPE_G_OBJECT_PATH,
-                           G_TYPE_INVALID);
-
-  dbus_g_proxy_connect_signal (priv->seat_proxy,
-                               "SessionAdded",
-                               G_CALLBACK (seat_proxy_session_added),
-                               self,
-                               NULL);
-  dbus_g_proxy_connect_signal (priv->seat_proxy,
-                               "SessionRemoved",
-                               G_CALLBACK (seat_proxy_session_removed),
-                               self,
-                               NULL);
-}
-
-static void
-create_cksession_proxy (UsersServiceDbus *service)
-{
-  UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (service);
-
-  priv->session_proxy = dbus_g_proxy_new_for_name (priv->system_bus,
-                                                   "org.freedesktop.ConsoleKit",
-                                                   priv->ssid,
-                                                   "org.freedesktop.ConsoleKit.Session");
-
-  if (!priv->session_proxy)
-    {
-      g_warning ("Failed to get ConsoleKit session proxy");
-      return;
-    }
-}
-
-static gchar *
-get_seat (UsersServiceDbus *service)
-{
-  UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (service);
-  GError     *error = NULL;
-  gchar      *ssid = NULL;
-  gchar      *seat;
-
-  if (!dbus_g_proxy_call (priv->ck_proxy,
-                          "GetCurrentSession",
-                          &error,
-                          G_TYPE_INVALID,
-                          DBUS_TYPE_G_OBJECT_PATH,
-                          &ssid,