Mercurial > pidgin
comparison libpurple/idle.c @ 18017:e9475e67e277
propagate from branch 'im.pidgin.pidgin' (head 7fa526ccf77d3d2da927a55aa8115be7e1be184d)
to branch 'im.pidgin.rlaager.merging.for_2_1_0' (head 732274030c41038a70db50927f8a4db4b30f6cdf)
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sun, 20 May 2007 14:57:39 +0000 |
| parents | a8b4444f2515 b27e535cce50 |
| children | 3c4811489e30 |
comparison
equal
deleted
inserted
replaced
| 18016:33da621d4b1f | 18017:e9475e67e277 |
|---|---|
| 195 purple_savedstatus_set_idleaway(TRUE); | 195 purple_savedstatus_set_idleaway(TRUE); |
| 196 no_away = 0; | 196 no_away = 0; |
| 197 } | 197 } |
| 198 else if (!no_away && time_idle < away_seconds) | 198 else if (!no_away && time_idle < away_seconds) |
| 199 { | 199 { |
| 200 no_away = 1; | |
| 200 purple_savedstatus_set_idleaway(FALSE); | 201 purple_savedstatus_set_idleaway(FALSE); |
| 201 no_away = 1; | |
| 202 if (time_until_next_idle_event == 0 || (away_seconds - time_idle) < time_until_next_idle_event) | 202 if (time_until_next_idle_event == 0 || (away_seconds - time_idle) < time_until_next_idle_event) |
| 203 time_until_next_idle_event = away_seconds - time_idle; | 203 time_until_next_idle_event = away_seconds - time_idle; |
| 204 } | 204 } |
| 205 | 205 |
| 206 /* Idle reporting stuff */ | 206 /* Idle reporting stuff */ |