Merge lp:~indicator-applet-developers/indicator-session/ubuntu into lp:~ubuntu-desktop/indicator-session/ubuntu

[Ted Gould]

[Ted Gould (ted)]

0.2.4

=== modified file 'configure.ac'
--- configure.ac	2010-02-18 15:46:44 +0000
+++ configure.ac	2010-02-25 18:04:20 +0000
@@ -4,7 +4,7 @@
 AC_PREREQ(2.53)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-session, 0.2.3)
+AM_INIT_AUTOMAKE(indicator-session, 0.2.4)
 
 AM_MAINTAINER_MODE
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2010-02-19 15:45:06 +0000
+++ debian/changelog	2010-02-25 18:04:20 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 indicator-session (0.2.3-0ubuntu2) lucid; urgency=low
 
   * debian/patches/fix-session-menu-without-gdm.patch
@@ -6,6 +7,19 @@
 
  -- Ken VanDine <[e-mail]>  Fri, 19 Feb 2010 09:43:14 -0500
 
+=======
+indicator-session (0.2.4-0ubuntu1~ppa1) lucid; urgency=low
+
+  * Upstream release 0.2.4
+    * When we can't shutdown with gnome-session fallback to using
+      ConsoleKit.
+    * Detect when GPM isn't available and don't error out.
+    * Change suspend and hibernate detection property names for
+      adjustment to upower.
+
+ -- Ted Gould <[e-mail]>  Thu, 25 Feb 2010 11:57:41 -0600
+
+>>>>>>> MERGE-SOURCE
 indicator-session (0.2.3-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.2.3
 
=== modified 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	2010-02-25 18:04:20 +0000
@@ -30,6 +30,44 @@
 #include "gconf-helper.h"
 
 static void
+consolekit_fallback (LogoutDialogAction action)
+{
+	DBusGConnection * sbus = dbus_g_bus_get(DBUS_BUS_SYSTEM, NULL);
+	g_return_if_fail(sbus != NULL); /* 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) {
+		g_warning("Unable to get consolekit proxy");
+		return;
+	}
+
+	switch (action) {
+		case LOGOUT_DIALOG_LOGOUT:
+			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);
+			break;
+		case LOGOUT_DIALOG_RESTART:
+			dbus_g_proxy_call_no_reply(proxy,
+			                           "Restart",
+			                           G_TYPE_INVALID);
+			break;
+		default:
+			g_warning("Unknown action");
+			break;
+	}
+
+	g_object_unref(proxy);
+
+	return;
+}
+
+static void
 session_action (LogoutDialogAction action)
 {
 	DBusGConnection * sbus;
@@ -50,6 +88,8 @@
 	if (sm_proxy == NULL) {
 		g_warning("Unable to get DBus proxy to SessionManager interface: %s", error->message);
 		g_error_free(error);
+
+		consolekit_fallback(action);
 		return;
 	}		
 	
 
=== modified file 'src/session-service.c'
--- src/session-service.c	2010-02-18 15:36:34 +0000
+++ src/session-service.c	2010-02-25 18:04:20 +0000
@@ -226,7 +226,7 @@
 		                                       G_TYPE_STRING,
 		                                       UP_INTERFACE,
 		                                       G_TYPE_STRING,
-		                                       "can-suspend",
+		                                       "CanSuspend",
 		                                       G_TYPE_INVALID,
 		                                       G_TYPE_VALUE,
 		                                       G_TYPE_INVALID);
@@ -242,7 +242,7 @@
 		                                         G_TYPE_STRING,
 		                                         UP_INTERFACE,
 		                                         G_TYPE_STRING,
-		                                         "can-hibernate",
+		                                         "CanHibernate",
 		                                         G_TYPE_INVALID,
 		                                         G_TYPE_VALUE,
 		                                         G_TYPE_INVALID);
 
=== modified file 'src/users-service-dbus.c'
--- src/users-service-dbus.c	2010-02-09 23:24:23 +0000
+++ src/users-service-dbus.c	2010-02-25 18:04:20 +0000
@@ -1,3 +1,4 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
 /*
  * Copyright 2009 Canonical Ltd.
  *
@@ -183,7 +184,8 @@
   create_ck_proxy (self);
   create_seat_proxy (self);
 
-  users_loaded (priv->gdm_proxy, self);
+  if (priv->gdm_proxy)
+    users_loaded (priv->gdm_proxy, self);
 }
 
 static void
@@ -214,7 +216,7 @@
     {
       if (error != NULL)
         {
-          g_error ("Unable to get DisplayManager proxy on system bus: %s", error->message);
+          g_warning ("Unable to get DisplayManager proxy on system bus: %s", error->message);
           g_error_free (error);
         }
 
@@ -679,6 +681,8 @@
   GError                  *error = NULL;
   gint                     count;
 
+  g_return_if_fail (proxy != NULL);
+
   service = (UsersServiceDbus *)user_data;
   priv = USERS_SERVICE_DBUS_GET_PRIVATE (service);
 
@@ -859,6 +863,8 @@
 start_new_user_session (UsersServiceDbus *self,
                         UserData         *user)
 {
+  g_return_val_if_fail (IS_USERS_SERVICE_DBUS (self), FALSE);
+
   UsersServiceDbusPrivate *priv = USERS_SERVICE_DBUS_GET_PRIVATE (self);
   GError   *error = NULL;
   char     *ssid;