Changeset 1aef8415e1cd98c88d3980e0d949c832c3ddd7e8

Show
Ignore:
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:
2 modified

Legend:

Unmodified
Added
Removed

  • ChangeLog

    rd1a41d2 r1aef841  
     1Version 0.5.1 (2009-11-02): 
     2 
     3        - fix stupid error on coming back from idle 
     4 
    15Version 0.5 (2009-11-01): 
    26 

  • callback.c

    rd1a41d2 r1aef841  
    3232        purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("got message from screensaver: active=%u\n"), screensaver_status); 
    3333 
    34         PurpleSavedStatus *status_idle, *status_saved; 
     34        PurpleSavedStatus *status_idle; 
    3535 
    3636        const char *awayonlock_savedstatus = purple_prefs_get_string(AWAYONLOCK_PREF_STATUS); 
    … …  
    4545 
    4646        PurpleSavedStatus *status_current = purple_savedstatus_get_current(); 
     47        PurpleSavedStatus *status_saved = purple_savedstatus_find_by_creation_time((time_t)purple_prefs_get_int(AWAYONLOCK_PREF_OLD_STATUS)); 
    4748 
    4849        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)) { 
    … …  
    5253        } 
    5354        else if (!screensaver_status && status_saved != NULL && status_saved != status_idle) { 
    54                 status_saved = purple_savedstatus_find_by_creation_time((time_t)purple_prefs_get_int(AWAYONLOCK_PREF_OLD_STATUS)); 
    5555                purple_debug(PURPLE_DEBUG_INFO, PACKAGE, N_("restoring status '%s'\n"), purple_savedstatus_get_title(status_saved)); 
    5656                purple_savedstatus_activate(status_saved);