aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-02-02 16:21:47 -0800
committerTed Gould <ted@gould.cx>2010-02-02 16:21:47 -0800
commit46250bfcf014c2e99395b712ca9bf0fb0b500edd (patch)
tree5af18cb653b207b139116c61862454ae90e354b0
parent4b4b9d7b499457dc8bae7d4d31955ec570eab343 (diff)
downloadayatana-indicator-session-46250bfcf014c2e99395b712ca9bf0fb0b500edd.tar.gz
ayatana-indicator-session-46250bfcf014c2e99395b712ca9bf0fb0b500edd.tar.bz2
ayatana-indicator-session-46250bfcf014c2e99395b712ca9bf0fb0b500edd.zip
Changing the lock_screen function to match the new activate prototype.
-rw-r--r--src/lock-helper.c2
-rw-r--r--src/lock-helper.h2
-rw-r--r--src/session-service.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/lock-helper.c b/src/lock-helper.c
index 0bdec6c..991aba2 100644
--- a/src/lock-helper.c
+++ b/src/lock-helper.c
@@ -279,7 +279,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..d6cada7 100644
--- a/src/session-service.c
+++ b/src/session-service.c
@@ -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,