ayatana-commits team mailing list archive

[Ted Gould <ted@xxxxxxxx>]

Ted Gould has proposed merging lp:~ted/indicator-session/dbusmenu-activate-change into lp:indicator-session.

    Requested reviews:
    Indicator Applet Developers (indicator-applet-developers)


Changing prototypes to match the new activate signal.

-- 
https://code.launchpad.net/~ted/indicator-session/dbusmenu-activate-change/+merge/18491
Your team ayatana-commits is subscribed to branch lp:indicator-session.

=== modified file 'src/lock-helper.c'
--- src/lock-helper.c	2009-10-07 17:10:38 +0000
+++ src/lock-helper.c	2010-02-03 00:35:22 +0000
@@ -279,7 +279,7 @@
 /* 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()) {

=== modified file 'src/lock-helper.h'
--- src/lock-helper.h	2009-10-07 15:57:52 +0000
+++ src/lock-helper.h	2010-02-03 00:35:22 +0000
@@ -30,7 +30,7 @@
 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);
 

=== modified file 'src/session-service.c'
--- src/session-service.c	2010-01-04 21:21:48 +0000
+++ src/session-service.c	2010-02-03 00:35:22 +0000
@@ -92,7 +92,7 @@
 /* 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 @@
 	}
 
 	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 @@
    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);
@@ -298,7 +298,7 @@
 
 /* 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 @@
 
 /* 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 @@
 
 /* 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;