Changeset 1aef8415e1cd98c88d3980e0d949c832c3ddd7e8 for callback.c

Timestamp:

11/02/09 23:07:30 (2 years ago)

Author:

Leo Antunes <leo@…>

Children:

c68958924df4ea4c8ce47eefd0faca0bab8902e2

Parents:

d1a41d2b9e8293b7310d616fd8ccd24ddf38d9be

git-committer:

Leo Antunes <leo@…> (11/02/09 23:07:30)

Message:

get saved status before deciding what to do

Files:

• callback.c (modified) (3 diffs)

callback.c

@@ -32 +32 @@
         purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("got message from screensaver: active=%u\n"), screensaver_status);
 
-        PurpleSavedStatus *status_idle, *status_saved;
+        PurpleSavedStatus *status_idle;
 
         const char *awayonlock_savedstatus = purple_prefs_get_string(AWAYONLOCK_PREF_STATUS);
@@ -45 +45 @@
 
         PurpleSavedStatus *status_current = purple_savedstatus_get_current();
+        PurpleSavedStatus *status_saved = purple_savedstatus_find_by_creation_time((time_t)purple_prefs_get_int(AWAYONLOCK_PREF_OLD_STATUS));
 
         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)) {
@@ -52 +53 @@
         }
         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);