Mercurial > pidgin.yaz
comparison libpurple/savedstatuses.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 | 8290e36a5a73 |
comparison
equal
deleted
inserted
replaced
26270:15911f71e37f | 26851:6bc0e4e76207 |
---|---|
868 | 868 |
869 if (purple_savedstatus_is_idleaway() == idleaway) | 869 if (purple_savedstatus_is_idleaway() == idleaway) |
870 /* Don't need to do anything */ | 870 /* Don't need to do anything */ |
871 return; | 871 return; |
872 | 872 |
873 /* Changing our status makes us un-idle */ | |
874 if (!idleaway) | |
875 purple_idle_touch(); | |
876 | |
877 old = purple_savedstatus_get_current(); | 873 old = purple_savedstatus_get_current(); |
878 saved_status = idleaway ? purple_savedstatus_get_idleaway() | 874 saved_status = idleaway ? purple_savedstatus_get_idleaway() |
879 : purple_savedstatus_get_default(); | 875 : purple_savedstatus_get_default(); |
880 purple_prefs_set_bool("/purple/savedstatus/isidleaway", idleaway); | 876 purple_prefs_set_bool("/purple/savedstatus/isidleaway", idleaway); |
877 | |
878 /* Changing our status makes us un-idle */ | |
879 if (!idleaway) | |
880 purple_idle_touch(); | |
881 | 881 |
882 if (idleaway && (purple_savedstatus_get_type(old) != PURPLE_STATUS_AVAILABLE)) | 882 if (idleaway && (purple_savedstatus_get_type(old) != PURPLE_STATUS_AVAILABLE)) |
883 /* Our global status is already "away," so don't change anything */ | 883 /* Our global status is already "away," so don't change anything */ |
884 return; | 884 return; |
885 | 885 |