* Upstream release 0.2.1

  * Dbusmenu 0.2.2 support
  * GNOME Screensaver fix (LP: #484603)

5 files changed, 26 insertions, 19 deletions

diff --git a/configure.ac b/configure.ac
index cfa4e87..5ccc43d 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.0)
+AM_INIT_AUTOMAKE(indicator-session, 0.2.1)
 
 AM_MAINTAINER_MODE
 
@@ -27,7 +27,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
 GTK_REQUIRED_VERSION=2.12
 INDICATOR_REQUIRED_VERSION=0.3.0
-DBUSMENUGTK_REQUIRED_VERSION=0.2.0
+DBUSMENUGTK_REQUIRED_VERSION=0.2.2
 POLKIT_REQUIRED_VERSION=0.92
 
 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
diff --git a/debian/changelog b/debian/changelog
index 8761b32..a48587e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+indicator-session (0.2.1-0ubuntu1~ppa1) UNRELEASED; urgency=low
+
+  * Upstream release 0.2.1
+    * Dbusmenu 0.2.2 support
+    * GNOME Screensaver fix (LP: #484603)
+
+ -- Ted Gould <ted@ubuntu.com>  Thu, 04 Feb 2010 17:28:46 -0800
+
 indicator-session (0.2.0-0ubuntu1) lucid; urgency=low
 
   * Upstream release 0.2.0
diff --git a/src/lock-helper.c b/src/lock-helper.c
index 02d0f96..f9c46cc 100644
--- a/src/lock-helper.c
+++ b/src/lock-helper.c
@@ -250,11 +250,10 @@ 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);
+	gss_proxy = dbus_g_proxy_new_for_name(session_bus,
+	                                      "org.gnome.ScreenSaver",
+	                                      "/",
+	                                      "org.gnome.ScreenSaver");
 	g_return_if_fail(gss_proxy != NULL);
 
 	dbus_g_proxy_add_signal(gss_proxy, "ActiveChanged", G_TYPE_BOOLEAN, G_TYPE_INVALID);
@@ -281,7 +280,7 @@ activate_timeout (gpointer data)
 /* 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)
+lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data)
 {
 	g_debug("Lock Screen");
 	if (!will_lock_screen()) {
diff --git a/src/lock-helper.h b/src/lock-helper.h
index b4a382e..ebcd635 100644
--- a/src/lock-helper.h
+++ b/src/lock-helper.h
@@ -30,7 +30,7 @@ void screensaver_throttle (gchar * reason);
 void screensaver_unthrottle (void);
 
 gboolean will_lock_screen (void);
-void lock_screen (DbusmenuMenuitem * mi, gpointer data);
+void lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data);
 gboolean lock_screen_setup (gpointer data);
 void lock_screen_gdm_cb_set (gdm_autologin_cb_t cb);
 
diff --git a/src/session-service.c b/src/session-service.c
index bec7749..8306d02 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -92,7 +92,7 @@ sleep_response (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data)
 /* Let's put this machine to sleep, with some info on how
    it should sleep.  */
 static void
-machine_sleep (DbusmenuMenuitem * mi, gpointer userdata)
+machine_sleep (DbusmenuMenuitem * mi, guint timestamp, gpointer userdata)
 {
 	gchar * type = (gchar *)userdata;
 
@@ -101,7 +101,7 @@ machine_sleep (DbusmenuMenuitem * mi, gpointer userdata)
 	}
 
 	screensaver_throttle(type);
-	lock_screen(NULL, NULL);
+	lock_screen(NULL, 0, NULL);
 
 	dbus_g_proxy_begin_call(dkp_main_proxy,
 	                        type,
@@ -245,7 +245,7 @@ setup_dkp (void) {
    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)
+show_dialog (DbusmenuMenuitem * mi, guint timestamp, gchar * type)
 {
 	gchar * helper = g_build_filename(LIBEXECDIR, "gtk-logout-helper", NULL);
 	gchar * dialog_line = g_strdup_printf("%s --%s", helper, type);
@@ -270,9 +270,9 @@ static void
 gdm_settings_change (void)
 {
 	if (!will_lock_screen()) {
-		dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_SENSITIVE, FALSE);
+		dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
 	} else {
-		dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_SENSITIVE, TRUE);
+		dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
 	}
 
 	return;
@@ -298,7 +298,7 @@ check_guest_session (void)
 
 /* Called when someone clicks on the guest session item. */
 static void
-activate_guest_session (DbusmenuMenuitem * mi, gpointer user_data)
+activate_guest_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
 {
 	GError * error = NULL;
 	if (!g_spawn_command_line_async(GUEST_SESSION_LAUNCHER, &error)) {
@@ -338,7 +338,7 @@ check_new_session (void)
 
 /* Starts a new generic session */
 static void
-activate_new_session (DbusmenuMenuitem * mi, gpointer user_data)
+activate_new_session (DbusmenuMenuitem * mi, guint timestamp, gpointer user_data)
 {
 	GError * error = NULL;
 	if (!g_spawn_command_line_async("gdmflexiserver --startnew", &error)) {
@@ -351,7 +351,7 @@ activate_new_session (DbusmenuMenuitem * mi, gpointer user_data)
 
 /* Activates a session for a particular user. */
 static void
-activate_user_session (DbusmenuMenuitem *mi, gpointer user_data)
+activate_user_session (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data)
 {
   UserData *user = (UserData *)user_data;
   UsersServiceDbus *service = user->service;
@@ -393,9 +393,9 @@ rebuild_items (DbusmenuMenuitem *root,
   g_signal_connect(G_OBJECT(lock_menuitem), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, G_CALLBACK(lock_screen), NULL);
   dbusmenu_menuitem_child_append(root, lock_menuitem);
   if (!will_lock_screen()) {
-    dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_SENSITIVE, FALSE);
+    dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, FALSE);
   } else {
-    dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_SENSITIVE, TRUE);
+    dbusmenu_menuitem_property_set_bool(lock_menuitem, DBUSMENU_MENUITEM_PROP_ENABLED, TRUE);
   }
 
   if (can_activate == TRUE)