releasing version 0.2.5-0ubuntu1

21 files changed, 864 insertions, 870 deletions

diff --git a/.bzrignore b/.bzrignore
index 0a49cb4..c993ea1 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -54,3 +54,4 @@ 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
+src/consolekit-manager-client.h
diff --git a/Makefile.am b/Makefile.am
index 3d97874..39b5cdb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ SUBDIRS = \
 	data \
 	po
 
-EXTRA_DIST = COPYING.LGPL autogen.sh
+EXTRA_DIST = autogen.sh
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall
 
diff --git a/configure.ac b/configure.ac
index b3bfd8b..f79fa93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c)
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.2.4)
+AM_INIT_AUTOMAKE(indicator-session, 0.2.5)
 
 AM_MAINTAINER_MODE
 
@@ -127,7 +127,6 @@ AM_GLIB_GNU_GETTEXT
 AC_OUTPUT([
 Makefile
 src/Makefile
-src/gtk-dialog/Makefile
 data/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/debian/changelog b/debian/changelog
index 68d8e57..47e7be3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+indicator-session (0.2.5-0ubuntu1) lucid; urgency=low
+
+  * Upstream Release 0.2.5
+    * Restart required menu item when it's required for updates
+    * New logout dialogs.
+    * Fix naming to "Switch off" and "Sleep"
+    * Blocking the current user from the user list
+    * Change sorting to be based on real names and handle conflicts
+    * Removing some ConsoleKit errors (lp: #529830)
+    * Memory leak on PangoLayout allocation
+    * Don't set GTK decorations
+    * ConsoleKit fallback if gnome-session not available
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Mar 2010 12:33:08 -0600
+
 indicator-session (0.2.4-0ubuntu2) lucid; urgency=low
 
   * Backport upstream change to fix decoration rendering issues
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4f28e2a..6492f1e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +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/gconf-helper.c
+src/gtk-logout-helper.c
+src/dialog.c
 src/indicator-session.c
 src/session-service.c
diff --git a/src/Makefile.am b/src/Makefile.am
index fdbf466..cd525bd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
-SUBDIRS = gtk-dialog
 
-libexec_PROGRAMS = indicator-session-service
+libexec_PROGRAMS = \
+	indicator-session-service \
+	gtk-logout-helper
 
 ###################
 # Indicator Stuff
@@ -17,6 +18,12 @@ libsession_la_CFLAGS = $(APPLET_CFLAGS) -Wall -Werror
 libsession_la_LIBADD = $(APPLET_LIBS)
 libsession_la_LDFLAGS = -module -avoid-version
 
+consolekit-manager-client.h: $(srcdir)/consolekit-manager.xml
+	dbus-binding-tool \
+		--prefix=_consolekit_manager_client \
+		--mode=glib-client \
+		--output=consolekit-manager-client.h \
+		$(srcdir)/consolekit-manager.xml
 
 users-service-client.h: $(srcdir)/users-service.xml
 	dbus-binding-tool \
@@ -44,23 +51,49 @@ indicator_session_service_SOURCES = \
 	lock-helper.h \
 	session-service.c \
 	dbusmenu-shared.h \
-	gtk-dialog/gconf-helper.c \
+	gconf-helper.c \
 	users-service-dbus.h \
 	users-service-dbus.c \
 	users-service-marshal.c
 indicator_session_service_CFLAGS = $(SESSIONSERVICE_CFLAGS) $(GCONF_CFLAGS) -DLIBEXECDIR=\"$(libexecdir)\" -Wall -Werror
 indicator_session_service_LDADD = $(SESSIONSERVICE_LIBS) $(GCONF_LIBS)
 
+#################
+# GTK Logout Stuff
+#################
+
+gtk_logout_helper_SOURCES = \
+	gtk-logout-helper.c \
+	gconf-helper.c \
+	gconf-helper.h \
+	dialog.c \
+	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)
+
+
 ###############
 # Other Stuff
 ###############
 
 BUILT_SOURCES = \
+	consolekit-manager-client.h \
 	users-service-client.h \
 	users-service-marshal.h \
 	users-service-marshal.c
 
 EXTRA_DIST = \
+	consolekit-manager.xml \
 	users-service.xml \
 	users-service.list
 
diff --git a/src/consolekit-manager.xml b/src/consolekit-manager.xml
new file mode 100644
index 0000000..f903b55
--- /dev/null
+++ b/src/consolekit-manager.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<node name="/org/freedesktop/ConsoleKit/Manager"
+  xmlns:doc="http://www.freedesktop.org/dbus/1.0/doc.dtd"
+>
+
+  <interface name="org.freedesktop.ConsoleKit.Manager">
+    <method name="Restart">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This method initiates a request to restart (ie. reboot) the computer system.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="CanRestart">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="can_restart" type="b" direction="out"/>
+    </method>
+
+    <method name="Stop">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This method initiates a request to stop (ie. shutdown) the computer system.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="CanStop">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="can_stop" type="b" direction="out"/>
+    </method>
+
+    <method name="OpenSession">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="cookie" direction="out" type="s">
+        <doc:doc>
+          <doc:summary>The secret cookie that is used to identify the new session</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This method requests that a new <doc:ref type="interface" to="Session">Session</doc:ref>
+          be created for the calling process.  The properties of this new Session are set automatically
+          from information collected about the calling process.
+          </doc:para>
+          <doc:para>This new session exists until the calling process disconnects from the system bus or
+          calls <doc:ref type="method" to="Manager.CloseSession">CloseSession()</doc:ref>.
+          </doc:para>
+          <doc:para>It is the responsibility of the calling process to set the environment variable
+          XDG_SESSION_COOKIE to the value of the returned cookie.  This cookie should only
+          be made available to child processes of the caller so that they may be identified
+          as members of this session.
+          </doc:para>
+          <doc:para>See this simple example:
+          <doc:example language="c" title="simple example"><doc:code>
+	DBusError       error;
+	DBusMessage    *message;
+	DBusMessage    *reply;
+
+	message = dbus_message_new_method_call ("org.freedesktop.ConsoleKit",
+						"/org/freedesktop/ConsoleKit/Manager",
+						"org.freedesktop.ConsoleKit.Manager",
+						"OpenSession");
+	if (message == NULL) {
+		goto out;
+	}
+
+        dbus_error_init (&amp;error);
+        reply = dbus_connection_send_with_reply_and_block (connector->connection,
+                                                           message,
+                                                           -1,
+                                                           &amp;error);
+        if (reply == NULL) {
+		goto out;
+        }
+
+        dbus_error_init (&amp;error);
+        if (! dbus_message_get_args (reply,
+                                     &amp;error,
+                                     DBUS_TYPE_STRING, &amp;cookie,
+                                     DBUS_TYPE_INVALID)) {
+		goto out;
+        }
+
+          </doc:code></doc:example></doc:para>
+        </doc:description>
+        <doc:seealso><doc:ref type="method" to="Manager.OpenSessionWithParameters">OpenSessionWithParameters()</doc:ref></doc:seealso>
+      </doc:doc>
+    </method>
+    <method name="OpenSessionWithParameters">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="parameters" direction="in" type="a(sv)">
+        <doc:doc>
+          <doc:summary>An array of sets of property names and values</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="cookie" direction="out" type="s">
+        <doc:doc>
+          <doc:summary>The secret cookie that is used to identify the new session</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This method requests that a new <doc:ref type="interface" to="Session">Session</doc:ref>
+          be created for the calling process.  The properties of this new Session are from the
+          parameters provided.
+          </doc:para>
+          <doc:para>This new session exists until the calling process disconnects from the system bus or
+          calls <doc:ref type="method" to="Manager.CloseSession">CloseSession()</doc:ref>.
+          </doc:para>
+          <doc:para>It is the responsibility of the calling process to set the environment variable
+          XDG_SESSION_COOKIE to the value of the returned cookie.  This cookie should only
+          be made available to child processes of the caller so that they may be identified
+          as members of this session.
+          </doc:para>
+          <doc:para>See the <doc:ref type="interface" to="Session">Session</doc:ref> properties for a list of valid parameters.</doc:para>
+        </doc:description>
+        <doc:seealso><doc:ref type="interface" to="Session">org.freedesktop.ConsoleKit.Session</doc:ref></doc:seealso>
+        <doc:permission>This method is restricted to privileged users by D-Bus policy.</doc:permission>
+      </doc:doc>
+    </method>
+    <method name="CloseSession">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="cookie" direction="in" type="s">
+        <doc:doc>
+          <doc:summary>The secret cookie that is used to identify the session</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="result" direction="out" type="b">
+        <doc:doc>
+          <doc:summary>Whether the session was successfully closed</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This method is used to close the session identified by the supplied cookie.
+          </doc:para>
+          <doc:para>The session can only be closed by the same process that opened the session.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <method name="GetSeats">
+      <arg name="seats" direction="out" type="ao">
+        <doc:doc>
+          <doc:summary>an array of Seat IDs</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This gets a list of all the <doc:ref type="interface" to="Seat">Seats</doc:ref>
+          that are currently present on the system.</doc:para>
+          <doc:para>Each Seat ID is an D-Bus object path for the object that implements the
+          <doc:ref type="interface" to="Seat">Seat</doc:ref> interface.</doc:para>
+        </doc:description>
+        <doc:seealso><doc:ref type="interface" to="Seat">org.freedesktop.ConsoleKit.Seat</doc:ref></doc:seealso>
+      </doc:doc>
+    </method>
+
+    <method name="GetSessions">
+      <arg name="sessions" direction="out" type="ao">
+        <doc:doc>
+          <doc:summary>an array of Session IDs</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This gets a list of all the <doc:ref type="interface" to="Session">Sessions</doc:ref>
+          that are currently present on the system.</doc:para>
+          <doc:para>Each Session ID is an D-Bus object path for the object that implements the
+          <doc:ref type="interface" to="Session">Session</doc:ref> interface.</doc:para>
+        </doc:description>
+        <doc:seealso><doc:ref type="interface" to="Session">org.freedesktop.ConsoleKit.Session</doc:ref></doc:seealso>
+      </doc:doc>
+    </method>
+
+    <method name="GetSessionForCookie">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="cookie" direction="in" type="s">
+        <doc:doc>
+          <doc:summary>The secret cookie that is used to identify the session</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="ssid" direction="out" type="o">
+        <doc:doc>
+          <doc:summary>The object identifier for the current session</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Returns the session ID that is associated with the specified cookie.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+    <method name="GetSessionForUnixProcess">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="pid" direction="in" type="u">
+        <doc:doc>
+          <doc:summary>The POSIX process ID</doc:summary>
+        </doc:doc>
+      </arg>
+      <arg name="ssid" direction="out" type="o">
+        <doc:doc>
+          <doc:summary>The object identifier for the current session</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Attempts to determine the session ID for the specified
+          POSIX process ID (pid).
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+    <method name="GetCurrentSession">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="ssid" direction="out" type="o">
+        <doc:doc>
+          <doc:summary>The object identifier for the current session</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Attempts to determine the session ID that the caller belongs to.
+          </doc:para>
+          <doc:para>See this example of using dbus-send:
+          <doc:example language="shell" title="shell example"><doc:code>
+  dbus-send --system --dest=org.freedesktop.ConsoleKit \
+  --type=method_call --print-reply --reply-timeout=2000 \
+  /org/freedesktop/ConsoleKit/Manager \
+  org.freedesktop.ConsoleKit.Manager.GetCurrentSession
+          </doc:code></doc:example></doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+    <method name="GetSessionsForUnixUser">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="uid" direction="in" type="u">
+         <doc:doc>
+          <doc:summary>POSIX User identification</doc:summary>
+        </doc:doc>
+     </arg>
+      <arg name="sessions" direction="out" type="ao">
+        <doc:doc>
+          <doc:summary>an array of Session IDs</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This gets a list of all the <doc:ref type="interface" to="Session">Sessions</doc:ref>
+          that are currently open for the specified user.</doc:para>
+          <doc:para>Each Session ID is an D-Bus object path for the object that implements the
+          <doc:ref type="interface" to="Session">Session</doc:ref> interface.</doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+    <method name="GetSessionsForUser">
+      <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
+      <arg name="uid" direction="in" type="u">
+         <doc:doc>
+          <doc:summary>User identification</doc:summary>
+        </doc:doc>
+     </arg>
+      <arg name="sessions" direction="out" type="ao">
+        <doc:doc>
+          <doc:summary>an array of Session IDs</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>This gets a list of all the <doc:ref type="interface" to="Session">Sessions</doc:ref>
+          that are currently open for the specified user.</doc:para>
+          <doc:para>Each Session ID is an D-Bus object path for the object that implements the
+          <doc:ref type="interface" to="Session">Session</doc:ref> interface.</doc:para>
+        </doc:description>
+        <doc:deprecated version="0.1.3" instead="GetSessionsForUnixUser"/>
+      </doc:doc>
+    </method>
+
+    <method name="GetSystemIdleHint">
+      <arg name="idle_hint" type="b" direction="out">
+        <doc:doc>
+          <doc:summary>The value of the system-idle-hint</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Returns TRUE if the <doc:ref type="property" to="Session:idle-hint">idle-hint</doc:ref>
+          property of every open session is TRUE or if there are no open sessions.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+    <method name="GetSystemIdleSinceHint">
+      <arg name="iso8601_datetime" type="s" direction="out">
+        <doc:doc>
+          <doc:summary>An ISO 8601 format date-type string</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Returns an ISO 8601 date-time string that corresponds to
+          the time of the last change of the system-idle-hint.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </method>
+
+    <signal name="SeatAdded">
+      <arg name="sid" type="o">
+        <doc:doc>
+          <doc:summary>The Seat ID for the added seat</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Emitted when a Seat has been added to the system.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+    <signal name="SeatRemoved">
+      <arg name="sid" type="o">
+        <doc:doc>
+          <doc:summary>The Seat ID for the removed seat</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Emitted when a Seat has been removed from the system.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+    <signal name="SystemIdleHintChanged">
+      <arg name="hint" type="b">
+        <doc:doc>
+          <doc:summary>The value of the system-idle-hint</doc:summary>
+        </doc:doc>
+      </arg>
+      <doc:doc>
+        <doc:description>
+          <doc:para>Emitted when the value of the system-idle-hint has changed.
+          </doc:para>
+        </doc:description>
+      </doc:doc>
+    </signal>
+  </interface>
+</node>
diff --git a/src/dialog.c b/src/dialog.c
new file mode 100644
index 0000000..deefe0b
--- /dev/null
+++ b/src/dialog.c
@@ -0,0 +1,230 @@
+/*
+A dialog to ask the user about the various logout options that
+are available.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+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 <glib/gi18n.h>
+
+#include "consolekit-manager-client.h"
+#include "dialog.h"
+
+/* Strings */
+
+static const gchar * title_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("title", "Log Out"),
+	/* LOGOUT_DIALOG_RESTART, */	NC_("title", "Restart"),
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("title", "Switch Off")
+};
+
+static const gchar * body_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+	/* LOGOUT_DIALOG_LOGOUT, */ 	N_("Are you sure you want to close all programs and log out of the computer?"),
+	/* LOGOUT_DIALOG_RESTART, */	N_("Are you sure you want to close all programs and restart the computer?"),
+	/* LOGOUT_DIALOG_SHUTDOWN, */	N_("Are you sure you want to close all programs and shut down the computer?")
+};
+
+static const gchar * button_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("button", "Log Out"),
+	/* LOGOUT_DIALOG_RESTART, */	NC_("button", "Restart"),
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button", "Switch Off")
+};
+
+/* TRANSLATORS: These strings have an ellipsis so that the user knows
+   they are also going to get a password dialog to do the action. */
+static const gchar * button_auth_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+	/* LOGOUT_DIALOG_LOGOUT, */ 	NC_("button auth", "Log Out"),
+	/* LOGOUT_DIALOG_RESTART, */	NC_("button auth", "Restart..."),
+	/* LOGOUT_DIALOG_SHUTDOWN, */	NC_("button auth", "Switch Off...")
+};
+
+/* TRANSLATORS: This button appears on the logout dialog when
+   there are updates that require restart.  It will do a restart
+   in place of a log out. */
+static const gchar * restart_updates = N_("Restart Instead");
+static const gchar * restart_auth = N_("Restart Instead...");
+static const gchar * body_logout_update = N_("Some software updates won't apply until the computer next restarts.");
+
+static const gchar * icon_strings[LOGOUT_DIALOG_TYPE_CNT] = {
+	/* LOGOUT_DIALOG_LOGOUT, */ 	"system-log-out",
+	/* LOGOUT_DIALOG_RESTART, */	"system-restart",
+	/* LOGOUT_DIALOG_SHUTDOWN, */	"system-shutdown"
+};
+
+
+
+typedef struct _LogoutDialogPrivate LogoutDialogPrivate;
+struct _LogoutDialogPrivate {
+	guint type;
+};
+
+#define LOGOUT_DIALOG_GET_PRIVATE(o) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((o), LOGOUT_DIALOG_TYPE, LogoutDialogPrivate))
+
+static void logout_dialog_class_init (LogoutDialogClass *klass);
+static void logout_dialog_init       (LogoutDialog *self);
+static void logout_dialog_dispose    (GObject *object);
+static void logout_dialog_finalize   (GObject *object);
+
+G_DEFINE_TYPE (LogoutDialog, logout_dialog, GTK_TYPE_MESSAGE_DIALOG);
+
+static void
+logout_dialog_class_init (LogoutDialogClass *klass)
+{
+	GObjectClass *object_class = G_OBJECT_CLASS (klass);
+
+	g_type_class_add_private (klass, sizeof (LogoutDialogPrivate));
+
+	object_class->dispose = logout_dialog_dispose;
+	object_class->finalize = logout_dialog_finalize;
+
+	return;
+}
+
+static void
+logout_dialog_init (LogoutDialog *self)
+{
+
+	return;
+}
+
+static void
+logout_dialog_dispose (GObject *object)
+{
+
+
+	G_OBJECT_CLASS (logout_dialog_parent_class)->dispose (object);
+	return;
+}
+
+static void
+logout_dialog_finalize (GObject *object)
+{
+
+
+	G_OBJECT_CLASS (logout_dialog_parent_class)->finalize (object);
+	return;
+}
+
+/* Checks for updates that would signal that a restart is
+   required for them to apply */
+static gboolean
+check_restart_required (void)
+{
+	return g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS);
+}
+
+/* Checks with console kit to see if we can do what we want */
+static gboolean
+ck_check_allowed (LogoutDialogType type)
+{
+	DBusGConnection * system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
+	g_return_val_if_fail(system_bus != NULL, TRUE);
+
+	DBusGProxy * ck_proxy = dbus_g_proxy_new_for_name (system_bus,
+	                                                   "org.freedesktop.ConsoleKit",
+	                                                   "/org/freedesktop/ConsoleKit/Manager",
+	                                                   "org.freedesktop.ConsoleKit.Manager");
+	g_return_val_if_fail(ck_proxy != NULL, TRUE);
+
+	gboolean retval = TRUE;
+	switch (type) {
+	case LOGOUT_DIALOG_TYPE_RESTART:
+		org_freedesktop_ConsoleKit_Manager_can_restart(ck_proxy, &retval, NULL);
+		break;
+	case LOGOUT_DIALOG_TYPE_SHUTDOWN:
+		org_freedesktop_ConsoleKit_Manager_can_stop(ck_proxy, &retval, NULL);
+		break;
+	default:
+		break;
+	}
+
+	g_object_unref(ck_proxy);
+
+	return retval;
+}
+
+LogoutDialog *
+logout_dialog_new (LogoutDialogType type)
+{
+	GtkWidget * image = gtk_image_new_from_icon_name(icon_strings[type], GTK_ICON_SIZE_DIALOG);
+	gtk_widget_show(image);
+
+	LogoutDialog * dialog = LOGOUT_DIALOG(g_object_new(LOGOUT_DIALOG_TYPE,
+	                                      /* Window */
+	                                      "icon-name", icon_strings[type],
+	                                      "modal", TRUE,
+	                                      "resizable", FALSE,
+	                                      "title", _(title_strings[type]),
+	                                      "window-position", GTK_WIN_POS_CENTER_ALWAYS,
+	                                      /* Message Dialog */
+	                                      "buttons", GTK_BUTTONS_NONE,
+	                                      "image", image,
+	                                      "message-type", GTK_MESSAGE_OTHER,
+	                                      "text", _(body_strings[type]),
+	                                      NULL));
+
+	gboolean allowed = FALSE;
+	if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) {
+		allowed = ck_check_allowed(LOGOUT_DIALOG_TYPE_RESTART);
+	} else {
+		allowed = ck_check_allowed(type);
+	}
+
+	gboolean restart_required = FALSE;
+	if (type == LOGOUT_DIALOG_TYPE_LOG_OUT) {
+		restart_required = check_restart_required();
+	}
+
+	const gchar * button_text;
+	if (allowed) {
+		button_text = _(button_strings[type]);
+	} else {
+		button_text = _(button_auth_strings[type]);
+	}
+
+	if (restart_required) {
+		const gchar * restart_req;
+		if (allowed) {
+			restart_req = restart_updates;
+		} else {
+			restart_req = restart_auth;
+		}
+
+		g_object_set(dialog, "secondary-text", _(body_logout_update), NULL);
+
+		gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+		                       _(restart_req), GTK_RESPONSE_HELP,
+		                       _("Cancel"), GTK_RESPONSE_CANCEL,
+		                       button_text, GTK_RESPONSE_OK,
+		                       NULL);
+	} else {
+		gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+		                       _("Cancel"), GTK_RESPONSE_CANCEL,
+		                       button_text, GTK_RESPONSE_OK,
+		                       NULL);
+	}
+
+	gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_OK);
+
+	return dialog;
+}
diff --git a/src/dialog.h b/src/dialog.h
new file mode 100644
index 0000000..18a55a7
--- /dev/null
+++ b/src/dialog.h
@@ -0,0 +1,64 @@
+/*
+A dialog to ask the user about the various logout options that
+are available.
+
+Copyright 2010 Canonical Ltd.
+
+Authors:
+    Ted Gould <ted@canonical.com>
+
+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 __LOGOUT_DIALOG_H__
+#define __LOGOUT_DIALOG_H__
+
+#include <glib.h>
+#include <glib-object.h>
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define LOGOUT_DIALOG_TYPE            (logout_dialog_get_type ())
+#define LOGOUT_DIALOG(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), LOGOUT_DIALOG_TYPE, LogoutDialog))
+#define LOGOUT_DIALOG_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), LOGOUT_DIALOG_TYPE, LogoutDialogClass))
+#define IS_LOGOUT_DIALOG(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), LOGOUT_DIALOG_TYPE))
+#define IS_LOGOUT_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), LOGOUT_DIALOG_TYPE))
+#define LOGOUT_DIALOG_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), LOGOUT_DIALOG_TYPE, LogoutDialogClass))
+
+typedef enum _LogoutDialogType LogoutDialogType;
+enum _LogoutDialogType {
+	LOGOUT_DIALOG_TYPE_LOG_OUT,
+	LOGOUT_DIALOG_TYPE_RESTART,
+	LOGOUT_DIALOG_TYPE_SHUTDOWN,
+	LOGOUT_DIALOG_TYPE_CNT
+};
+
+typedef struct _LogoutDialog      LogoutDialog;
+typedef struct _LogoutDialogClass LogoutDialogClass;
+
+struct _LogoutDialogClass {
+	GtkMessageDialogClass parent_class;
+};
+
+struct _LogoutDialog {
+	GtkMessageDialog parent;
+};
+
+GType logout_dialog_get_type (void);
+LogoutDialog * logout_dialog_new (LogoutDialogType type);
+
+G_END_DECLS
+
+#endif
diff --git a/src/gtk-dialog/gconf-helper.c b/src/gconf-helper.c
index 213592e..9262b19 100644
--- a/src/gtk-dialog/gconf-helper.c
+++ b/src/gconf-helper.c
@@ -51,11 +51,11 @@ static void update_menu_entries_callback (GConfClient *client, guint cnxn_id, GC
 		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"));
+			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off"));
 		} 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..."));
+			dbusmenu_menuitem_property_set(restart_shutdown_logout_mi->shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off..."));
 		}
 	}
 }
diff --git a/src/gtk-dialog/gconf-helper.h b/src/gconf-helper.h
index 951bb0f..951bb0f 100644
--- a/src/gtk-dialog/gconf-helper.h
+++ b/src/gconf-helper.h
diff --git a/src/gtk-dialog/Makefile.am b/src/gtk-dialog/Makefile.am
deleted file mode 100644
index 3f14d78..0000000
--- a/src/gtk-dialog/Makefile.am
+++ /dev/null
@@ -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)
-
diff --git a/src/gtk-dialog/ck-pk-helper.c b/src/gtk-dialog/ck-pk-helper.c
deleted file mode 100644
index dc7d900..0000000
--- a/src/gtk-dialog/ck-pk-helper.c
+++ /dev/null
@@ -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 <ted@canonical.com>
-
-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;
-	
-}
diff --git a/src/gtk-dialog/ck-pk-helper.h b/src/gtk-dialog/ck-pk-helper.h
deleted file mode 100644
index 501a8c8..0000000
--- a/src/gtk-dialog/ck-pk-helper.h
+++ /dev/null
@@ -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 <ted@canonical.com>
-
-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__ */
diff --git a/src/gtk-dialog/logout-dialog.c b/src/gtk-dialog/logout-dialog.c
deleted file mode 100644
index 98806ca..0000000
--- a/src/gtk-dialog/logout-dialog.c
+++ /dev/null
@@ -1,370 +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);
-
-  /* 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;
-}
-
diff --git a/src/gtk-dialog/logout-dialog.h b/src/gtk-dialog/logout-dialog.h
deleted file mode 100644
index 8b0ff09..0000000
--- a/src/gtk-dialog/logout-dialog.h
+++ /dev/null
@@ -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
diff --git a/src/gtk-dialog/gtk-logout-helper.c b/src/gtk-logout-helper.c
index 4c6614c..64fba14 100644
--- a/src/gtk-dialog/gtk-logout-helper.c
+++ b/src/gtk-logout-helper.c
@@ -25,12 +25,11 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <dbus/dbus-glib.h>
-#include "logout-dialog.h"
-#include "ck-pk-helper.h"
+#include "dialog.h"
 #include "gconf-helper.h"
 
 static void
-consolekit_fallback (LogoutDialogAction action)
+consolekit_fallback (LogoutDialogType action)
 {
 	DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
 	g_return_if_fail(sbus != NULL); /* worst case */
@@ -43,19 +42,23 @@ consolekit_fallback (LogoutDialogAction action)
 		return;
 	}
 
+	GError * error = NULL;
+
 	switch (action) {
-		case LOGOUT_DIALOG_LOGOUT:
+		case LOGOUT_DIALOG_TYPE_LOG_OUT:
 			g_warning("Unable to fallback to ConsoleKit for logout as it's a session issue.  We need some sort of session handler.");
 			break;
-		case LOGOUT_DIALOG_SHUTDOWN:
-			dbus_g_proxy_call_no_reply(proxy,
-			                           "Stop",
-			                           G_TYPE_INVALID);
+		case LOGOUT_DIALOG_TYPE_SHUTDOWN:
+			dbus_g_proxy_call(proxy,
+			                  "Stop",
+			                  &error,
+			                  G_TYPE_INVALID);
 			break;
-		case LOGOUT_DIALOG_RESTART:
-			dbus_g_proxy_call_no_reply(proxy,
-			                           "Restart",
-			                           G_TYPE_INVALID);
+		case LOGOUT_DIALOG_TYPE_RESTART:
+			dbus_g_proxy_call(proxy,
+			                  "Restart",
+			                  &error,
+			                  G_TYPE_INVALID);
 			break;
 		default:
 			g_warning("Unknown action");
@@ -64,11 +67,16 @@ consolekit_fallback (LogoutDialogAction action)
 
 	g_object_unref(proxy);
 
+	if (error != NULL) {
+		g_error("Unable to signal ConsoleKit: %s", error->message);
+		g_error_free(error);
+	}
+
 	return;
 }
 
 static void
-session_action (LogoutDialogAction action)
+session_action (LogoutDialogType action)
 {
 	DBusGConnection * sbus;
 	DBusGProxy * sm_proxy;
@@ -95,13 +103,13 @@ session_action (LogoutDialogAction action)
 	
 	g_clear_error (&error);
 	
-	if (action == LOGOUT_DIALOG_LOGOUT) {
+	if (action == LOGOUT_DIALOG_TYPE_LOG_OUT) {
 		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) {
+	} else if (action == LOGOUT_DIALOG_TYPE_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) {
+	} else if (action == LOGOUT_DIALOG_TYPE_RESTART) {
 		res = dbus_g_proxy_call_with_timeout (sm_proxy, "RequestReboot", INT_MAX, &error, 
 											  G_TYPE_INVALID, G_TYPE_INVALID);
 	} else {
@@ -125,32 +133,32 @@ session_action (LogoutDialogAction action)
 	return;
 }	
 
-static LogoutDialogAction type = LOGOUT_DIALOG_LOGOUT;
+static LogoutDialogType type = LOGOUT_DIALOG_TYPE_LOG_OUT;
 
 static gboolean
 option_logout (const gchar * arg, const gchar * value, gpointer data, GError * error)
 {
-	type = LOGOUT_DIALOG_LOGOUT;
+	type = LOGOUT_DIALOG_TYPE_LOG_OUT;
 	return TRUE;
 }
 
 static gboolean
 option_shutdown (const gchar * arg, const gchar * value, gpointer data, GError * error)
 {
-	type = LOGOUT_DIALOG_SHUTDOWN;
+	type = LOGOUT_DIALOG_TYPE_SHUTDOWN;
 	return TRUE;
 }
 
 static gboolean
 option_restart (const gchar * arg, const gchar * value, gpointer data, GError * error)
 {
-	type = LOGOUT_DIALOG_RESTART;
+	type = LOGOUT_DIALOG_TYPE_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},
+	{"shutdown",   's',  G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,  option_shutdown, "Switch off the entire system",     NULL},
 	{"restart",    'r',  G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,  option_restart,  "Restart the system",               NULL},
 
 	{NULL}
@@ -184,13 +192,8 @@ main (int argc, char * argv[])
 	                                  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);
+		dialog = GTK_WIDGET(logout_dialog_new(type));
 	}
 
 	if (dialog != NULL) {
@@ -198,7 +201,7 @@ main (int argc, char * argv[])
 		gtk_widget_hide(dialog);
 
 		if (response == GTK_RESPONSE_HELP) {
-			type = LOGOUT_DIALOG_RESTART;
+			type = LOGOUT_DIALOG_TYPE_RESTART;
 			response = GTK_RESPONSE_OK;
 		}
 
diff --git a/src/indicator-session.c b/src/indicator-session.c
index a97eb95..a815e40 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -214,6 +214,7 @@ switch_property_change (DbusmenuMenuitem * item, const gchar * property, const G
 
 		gint width;
 		pango_layout_get_pixel_size(layout, &width, NULL);
+		g_object_unref(layout);
 		g_debug("Username width %dpx", width);
 
 		gint point = pango_font_description_get_size(style->font_desc);
diff --git a/src/session-service.c b/src/session-service.c
index 289bff8..a6c3fc3 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -27,6 +27,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <unistd.h>
 
 #include <glib/gi18n.h>
+#include <gio/gio.h>
 
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-bindings.h>
@@ -40,7 +41,7 @@ with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "dbus-shared-names.h"
 #include "dbusmenu-shared.h"
 
-#include "gtk-dialog/gconf-helper.h"
+#include "gconf-helper.h"
 
 #include "users-service-dbus.h"
 #include "lock-helper.h"
@@ -68,9 +69,6 @@ static UsersServiceDbus  *dbus_interface = NULL;
 static DbusmenuMenuitem  *lock_menuitem = NULL;
 static DbusmenuMenuitem  *switch_menuitem = NULL;
 
-static gint   count;
-static GList *users;
-
 static DbusmenuMenuitem * root_menuitem = NULL;
 static GMainLoop * mainloop = NULL;
 static DBusGProxy * up_main_proxy = NULL;
@@ -406,7 +404,15 @@ compare_users_by_username (const gchar *a,
   UserData *user1 = (UserData *)a;
   UserData *user2 = (UserData *)b;
 
-  return g_strcmp0 (user1->user_name, user2->user_name);
+  gint retval = g_strcmp0 (user1->real_name, user2->real_name);
+
+  /* If they're the same, they're both in conflict. */
+  if (retval == 0) {
+    user1->real_name_conflict = TRUE;
+    user2->real_name_conflict = TRUE;
+  }
+
+  return retval;
 }
 
 /* Builds up the menu for us */
@@ -415,6 +421,7 @@ rebuild_items (DbusmenuMenuitem *root,
                UsersServiceDbus *service)
 {
   DbusmenuMenuitem *mi = NULL;
+  DbusmenuMenuitem * guest_mi = NULL;
   GList *u;
   UserData *user;
   gboolean can_activate;
@@ -444,12 +451,12 @@ rebuild_items (DbusmenuMenuitem *root,
 
       if (check_guest_session ())
         {
-          mi = dbusmenu_menuitem_new ();
-		  dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE);
-          dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, _("Guest Session"));
-          dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, FALSE);
-          dbusmenu_menuitem_child_append (root, mi);
-          g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL);
+          guest_mi = dbusmenu_menuitem_new ();
+		  dbusmenu_menuitem_property_set (guest_mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE);
+          dbusmenu_menuitem_property_set (guest_mi, USER_ITEM_PROP_NAME, _("Guest Session"));
+          dbusmenu_menuitem_property_set_bool (guest_mi, USER_ITEM_PROP_LOGGED_IN, FALSE);
+          dbusmenu_menuitem_child_append (root, guest_mi);
+          g_signal_connect (G_OBJECT (guest_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_guest_session), NULL);
         }
 
       if (check_new_session ())
@@ -472,39 +479,55 @@ rebuild_items (DbusmenuMenuitem *root,
             }
         }
 
-      if (count > MINIMUM_USERS && count < MAXIMUM_USERS)
-        {
-          if (users != NULL)
-            {
-              GList *l = NULL;
-
-              for (l = users; l != NULL; l = l->next)
-                {
-                  users = g_list_delete_link (users, l);
-                }
-
-              users = NULL;
-            }
-
-          users = users_service_dbus_get_user_list (service);
-
-          users = g_list_sort (users, (GCompareFunc)compare_users_by_username);
-
-          for (u = users; u != NULL; u = g_list_next (u))
-            {
-              user = u->data;
-
-              user->service = service;
-
-              mi = dbusmenu_menuitem_new ();
-              dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE);
-              dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name);
-			  dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL);
-              dbusmenu_menuitem_child_append (root, mi);
-              g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user);
-            }
-        }
-    }
+		GList * users = NULL;
+		users = users_service_dbus_get_user_list (service);
+		guint user_count = g_list_length(users);
+
+		if (user_count > MINIMUM_USERS && user_count < MAXIMUM_USERS) {
+			users = g_list_sort (users, (GCompareFunc)compare_users_by_username);
+		}
+
+		for (u = users; u != NULL; u = g_list_next (u)) {
+			user = u->data;
+			user->service = service;
+
+			if (user->uid == getuid()) {
+				/* Hide me from the list */
+				continue;
+			}
+
+			if (g_strcmp0(user->user_name, "guest") == 0) {
+				/* Check to see if the guest has sessions and so therefore should
+				   get a check mark. */
+				if (user->sessions != NULL) {
+					dbusmenu_menuitem_property_set_bool (guest_mi, USER_ITEM_PROP_LOGGED_IN, TRUE);
+				}
+				/* If we're showing user accounts, keep going through the list */
+				if (user_count > MINIMUM_USERS && user_count < MAXIMUM_USERS) {
+					continue;
+				}
+				/* If not, we can stop here */
+				break;
+			}
+
+			if (user_count > MINIMUM_USERS && user_count < MAXIMUM_USERS) {
+				mi = dbusmenu_menuitem_new ();
+				dbusmenu_menuitem_property_set (mi, DBUSMENU_MENUITEM_PROP_TYPE, USER_ITEM_TYPE);
+				if (user->real_name_conflict) {
+					gchar * conflictedname = g_strdup_printf("%s (%s)", user->real_name, user->user_name);
+					dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, conflictedname);
+					g_free(conflictedname);
+				} else {
+					dbusmenu_menuitem_property_set (mi, USER_ITEM_PROP_NAME, user->real_name);
+				}
+				dbusmenu_menuitem_property_set_bool (mi, USER_ITEM_PROP_LOGGED_IN, user->sessions != NULL);
+				dbusmenu_menuitem_child_append (root, mi);
+				g_signal_connect (G_OBJECT (mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK (activate_user_session), user);
+			}
+		}
+
+		g_list_free(users);
+	}
 
 	DbusmenuMenuitem * separator = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set(separator, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR);
@@ -521,7 +544,7 @@ rebuild_items (DbusmenuMenuitem *root,
 
 	suspend_mi = dbusmenu_menuitem_new();
 	dbusmenu_menuitem_property_set_bool(suspend_mi, DBUSMENU_MENUITEM_PROP_VISIBLE, FALSE);
-	dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Suspend"));
+	dbusmenu_menuitem_property_set(suspend_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Sleep"));
 	dbusmenu_menuitem_child_append(root, suspend_mi);
 	g_signal_connect(G_OBJECT(suspend_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(machine_sleep), "Suspend");
 
@@ -542,9 +565,9 @@ rebuild_items (DbusmenuMenuitem *root,
 
 	shutdown_mi = dbusmenu_menuitem_new();
 	if (supress_confirmations()) {
-		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down"));
+		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off"));
 	} else {
-		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Shut Down..."));
+		dbusmenu_menuitem_property_set(shutdown_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Switch Off..."));
 	}
 	dbusmenu_menuitem_child_append(root, shutdown_mi);
 	g_signal_connect(G_OBJECT(shutdown_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(show_dialog), "shutdown");
@@ -562,53 +585,65 @@ rebuild_items (DbusmenuMenuitem *root,
 /* Signal called when a user is added.  It updates the count and
    rebuilds the menu */
 static void
-user_added (UsersServiceDbus *service,
-            UserData         *user,
-            gpointer          user_data)
+user_change (UsersServiceDbus *service,
+             UserData         *user,
+             gpointer          user_data)
 {
-  DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data;
-
-  count++;
-
-  rebuild_items (root, service);
+	DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data;
+	rebuild_items (root, service);
+	return;
 }
 
-/* Signal called when a user is deleted.  It updates the count and
-   rebuilds the menu */
-static void
-user_removed (UsersServiceDbus *service,
-              UserData         *user,
-              gpointer          user_data)
+/* When the service interface starts to shutdown, we
+   should follow it. */
+void
+service_shutdown (IndicatorService * service, gpointer user_data)
 {
-  DbusmenuMenuitem *root = (DbusmenuMenuitem *)user_data;
-
-  count--;
-
-  rebuild_items (root, service);
+	if (mainloop != NULL) {
+		g_debug("Service shutdown");
+		g_main_loop_quit(mainloop);
+	}
+	return;
 }
 
-/* Wrapper around rebuild_items that is used on the first call
-   so that we can initialize the count variable. */
+/* When the directory changes we need to figure out how our menu
+   item should look. */
 static void
-create_items (DbusmenuMenuitem *root,
-              UsersServiceDbus *service)
+restart_dir_changed (void)
 {
-  g_return_if_fail (IS_USERS_SERVICE_DBUS (service));
-
-  count = users_service_dbus_get_user_count (service);
+	gboolean restart_required = g_file_test("/var/run/reboot-required", G_FILE_TEST_EXISTS);
+
+	if (restart_required) {
+		if (supress_confirmations()) {
+			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required"));
+		} else {
+			dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_LABEL, _("Restart Required..."));
+		}
+		dbusmenu_menuitem_property_set(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME, "emblem-important");
+	} else {	
+		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_property_remove(restart_mi, DBUSMENU_MENUITEM_PROP_ICON_NAME);
+	}
 
-  rebuild_items (root, service);
+	return;
 }
 
-/* When the service interface starts to shutdown, we
-   should follow it. */
-void
-service_shutdown (IndicatorService * service, gpointer user_data)
+/* Buids a file watcher for the directory so that when it
+   changes we can check to see if our reboot-required is
+   there. */
+static void
+setup_restart_watch (void)
 {
-	if (mainloop != NULL) {
-		g_debug("Service shutdown");
-		g_main_loop_quit(mainloop);
+	GFile * filedir = g_file_new_for_path("/var/run");
+	GFileMonitor * filemon = g_file_monitor_directory(filedir, G_FILE_MONITOR_NONE, NULL, NULL);
+	if (filemon != NULL) {
+		g_signal_connect(G_OBJECT(filemon), "changed", G_CALLBACK(restart_dir_changed), NULL);
 	}
+	restart_dir_changed();
 	return;
 }
 
@@ -638,17 +673,19 @@ main (int argc, char ** argv)
 
     dbus_interface = g_object_new (USERS_SERVICE_DBUS_TYPE, NULL);
 
-    create_items (root_menuitem, dbus_interface);
+    rebuild_items (root_menuitem, dbus_interface);
 
     g_signal_connect (G_OBJECT (dbus_interface),
                       "user-added",
-                      G_CALLBACK (user_added),
+                      G_CALLBACK (user_change),
                       root_menuitem);
     g_signal_connect (G_OBJECT (dbus_interface),
                       "user-removed",
-                      G_CALLBACK (user_removed),
+                      G_CALLBACK (user_change),
                       root_menuitem);
 
+	setup_restart_watch();
+
 	setup_up();
 
     DbusmenuServer * server = dbusmenu_server_new(INDICATOR_SESSION_DBUS_OBJECT);
diff --git a/src/users-service-dbus.c b/src/users-service-dbus.c
index 0e5c922..4aefdff 100644
--- a/src/users-service-dbus.c
+++ b/src/users-service-dbus.c
@@ -34,6 +34,7 @@
 #include "users-service-dbus.h"
 #include "users-service-client.h"
 #include "users-service-marshal.h"
+#include "consolekit-manager-client.h"
 
 static void     users_service_dbus_class_init         (UsersServiceDbusClass *klass);
 static void     users_service_dbus_init               (UsersServiceDbus  *self);
@@ -509,14 +510,7 @@ add_sessions_for_user (UsersServiceDbus *self,
   int              i;
 
   error = NULL;
-  if (!dbus_g_proxy_call (priv->ck_proxy,
-                          "GetSessionsForUnixUser",
-                          &error,
-                          G_TYPE_UINT, user->uid,
-                          G_TYPE_INVALID,
-                          dbus_g_type_get_collection ("GPtrArray", DBUS_TYPE_G_OBJECT_PATH),
-                          &sessions,
-                          G_TYPE_INVALID))
+  if (!org_freedesktop_ConsoleKit_Manager_get_sessions_for_unix_user(priv->ck_proxy, user->uid, &sessions, &error))
     {
       g_debug ("Failed to call GetSessionsForUnixUser: %s", error->message);
       g_error_free (error);
@@ -662,6 +656,7 @@ sync_users (UsersServiceDbus *self)
           user->shell       = g_strdup (g_value_get_string (g_value_array_get_nth (values, 3)));
           user->login_count = g_value_get_int    (g_value_array_get_nth (values, 4));
           user->icon_url    = g_strdup (g_value_get_string (g_value_array_get_nth (values, 5)));
+          user->real_name_conflict = FALSE;
 
           g_hash_table_insert (priv->users,
                                g_strdup (user->user_name),
diff --git a/src/users-service-dbus.h b/src/users-service-dbus.h
index 41052f8..bba88a7 100644
--- a/src/users-service-dbus.h
+++ b/src/users-service-dbus.h
@@ -47,6 +47,8 @@ struct _UserData
 
   GList   *sessions;
 
+  gboolean real_name_conflict;
+
   UsersServiceDbus *service;
 };