Mercurial > pidgin.yaz
diff libpurple/idle.c @ 26851:6bc0e4e76207
merge of '9df36977fc8f70d1b3124d32a54eb123df50aa0f'
and 'f92d95c83baba97463f923077688ba2eb144763b'
author | Peter Hjalmarsson <xake@rymdraket.net> |
---|---|
date | Fri, 01 May 2009 21:36:29 +0000 |
parents | 5325d2185e88 |
children |
line wrap: on
line diff
--- a/libpurple/idle.c Mon Mar 16 21:44:22 2009 +0000 +++ b/libpurple/idle.c Fri May 01 21:36:29 2009 +0000 @@ -187,9 +187,8 @@ purple_savedstatus_set_idleaway(TRUE); no_away = FALSE; } - else if (!no_away && time_idle < away_seconds) + else if (purple_savedstatus_is_idleaway() && time_idle < away_seconds) { - no_away = TRUE; purple_savedstatus_set_idleaway(FALSE); if (time_until_next_idle_event == 0 || (away_seconds - time_idle) < time_until_next_idle_event) time_until_next_idle_event = away_seconds - time_idle;