Changeset d1a41d2b9e8293b7310d616fd8ccd24ddf38d9be

Timestamp:

11/01/09 20:26:43 (2 years ago)

Author:

Leo Antunes <leo@…>

Children:

1aef8415e1cd98c88d3980e0d949c832c3ddd7e8

Parents:

e3cc7b23a6aba21796577ff44a9a3f9d855080cb

git-committer:

Leo Antunes <leo@…> (11/01/09 20:26:43)

Message:

- store changed status as pref and restore at startup if it exists:

avoid awayonlock messing with the last-online status if you quit
while idle.

- minor tweaks and fixes to the test script

Files:

• ChangeLog (modified) (1 diff)
• awayonlock.c (modified) (2 diffs)
• callback.c (modified) (2 diffs)
• prefs.h (modified) (1 diff)
• utils/mimic_gnome-screensaver.py (modified) (3 diffs)

ChangeLog

@@ +1 @@
+Version 0.5 (2009-11-01):
+
+        - store changed status as pref and restore at startup if it exists:
+          avoid awayonlock messing with the last-online status if you quit
+          while idle.
+        - minor tweaks and fixes to the test script
+
 Version 0.4 (2009-07-22):
 

awayonlock.c

@@ -56 +56 @@
         purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("plugin_load called\n"));
 
+        if(purple_prefs_get_int(AWAYONLOCK_PREF_OLD_STATUS) != 0) {
+                PurpleSavedStatus *status_saved = purple_savedstatus_find_by_creation_time((time_t)purple_prefs_get_int(AWAYONLOCK_PREF_OLD_STATUS));
+                purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("stale status '%s' located, restoring and clearing\n"), purple_savedstatus_get_title(status_saved));
+                purple_savedstatus_activate(status_saved);
+                purple_prefs_set_int(AWAYONLOCK_PREF_OLD_STATUS, 0);
+        }
+
         dbus_conn = dbus_g_bus_get(DBUS_BUS_SESSION, &error);
 
@@ -195 +202 @@
         purple_prefs_add_none(AWAYONLOCK_PREF_ROOT);
         purple_prefs_add_string(AWAYONLOCK_PREF_STATUS, NULL);
+        purple_prefs_add_int(AWAYONLOCK_PREF_OLD_STATUS, 0);
         purple_prefs_add_bool(AWAYONLOCK_PREF_AVAILABLE_ONLY, 0);
 }

callback.c

@@ -29 +29 @@
 #include "prefs.h"
 
-static PurpleSavedStatus *status_saved = NULL;
-
 void awayonlock_idle_changed_callback(DBusGProxy *proxy, gboolean screensaver_status, gpointer data) {
         purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("got message from screensaver: active=%u\n"), screensaver_status);
 
-        PurpleSavedStatus *status_idle;
+        PurpleSavedStatus *status_idle, *status_saved;
 
         const char *awayonlock_savedstatus = purple_prefs_get_string(AWAYONLOCK_PREF_STATUS);
@@ -49 +47 @@
 
         if(screensaver_status && ! purple_savedstatus_is_idleaway() && ((!available_only && purple_savedstatus_get_type(status_current) != PURPLE_STATUS_OFFLINE && purple_savedstatus_get_type(status_current) != PURPLE_STATUS_INVISIBLE) || purple_savedstatus_get_type(status_current) == PURPLE_STATUS_AVAILABLE)) {
-                status_saved = status_current;
-                purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("setting status as '%s' and storing '%s'\n"), purple_savedstatus_get_title(status_idle), purple_savedstatus_get_title(status_saved));
+                purple_prefs_set_int(AWAYONLOCK_PREF_OLD_STATUS, (int)purple_savedstatus_get_creation_time(status_current));
+                purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("setting status as '%s' and storing '%s'\n"), purple_savedstatus_get_title(status_idle), purple_savedstatus_get_title(status_current));
                 purple_savedstatus_activate(status_idle);
         }
         else if (!screensaver_status && status_saved != NULL && status_saved != status_idle) {
+                status_saved = purple_savedstatus_find_by_creation_time((time_t)purple_prefs_get_int(AWAYONLOCK_PREF_OLD_STATUS));
                 purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("restoring status '%s'\n"), purple_savedstatus_get_title(status_saved));
                 purple_savedstatus_activate(status_saved);
-                status_saved = NULL;
+                purple_prefs_set_int(AWAYONLOCK_PREF_OLD_STATUS, 0);
         }
         else {

prefs.h

@@ -28 +28 @@
 #define AWAYONLOCK_PREF_ROOT "/plugins/core/awayonlock"
 #define AWAYONLOCK_PREF_STATUS "/plugins/core/awayonlock/status"
+#define AWAYONLOCK_PREF_OLD_STATUS "/plugins/core/awayonlock/old_status"
 #define AWAYONLOCK_PREF_AVAILABLE_ONLY "/plugins/core/awayonlock/available_only"
 

utils/mimic_gnome-screensaver.py

@@ -3 +3 @@
 """
 incredibly dirty hack to test away-on-lock
+if gnome-screensaver is already running this wont work (it wont be able
+to pretend to be gnome-screensaver)
 """
 
@@ -18 +20 @@
 
         @dbus.service.signal(dbus_interface='org.gnome.ScreenSaver', signature='b')
-        def SessionIdleChanged(self, y):
+        def ActiveChanged(self, y):
                 print "emmitting...", repr(y)
                 return True
@@ -28 +30 @@
 t = Test('/org/gnome/ScreenSaver')
 gobject.timeout_add(   1, t.ActiveChanged, dbus.Boolean(1))
-gobject.timeout_add(2000, t.ActiveChanged, dbus.Boolean(0))
-gobject.timeout_add(2001, app.quit)
+gobject.timeout_add(5000, t.ActiveChanged, dbus.Boolean(0))
+gobject.timeout_add(5001, app.quit)
 
 app.run()