Mercurial > pidgin.yaz
comparison libpurple/protocols/oscar/oscar.c @ 27935:f33f4ddbf01a
propagate from branch 'im.pidgin.pidgin' (head d1b0914c480b5166f0687409b6a396866208d502)
to branch 'im.pidgin.pidgin.yaz' (head 16078332e16f8548aed3ca7dcd56049c6829caed)
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Sun, 15 Mar 2009 10:41:29 +0000 |
parents | f44832c6a65b 37a3f30a8d80 |
children | 1688f7e15530 |
comparison
equal
deleted
inserted
replaced
27934:c1f1ed4d7a12 | 27935:f33f4ddbf01a |
---|---|
4816 { | 4816 { |
4817 const char *status_html; | 4817 const char *status_html; |
4818 | 4818 |
4819 status_html = purple_status_get_attr_string(status, "message"); | 4819 status_html = purple_status_get_attr_string(status, "message"); |
4820 | 4820 |
4821 if (primitive == PURPLE_STATUS_AVAILABLE || primitive == PURPLE_STATUS_INVISIBLE) | 4821 if (status_html == NULL || primitive == PURPLE_STATUS_AVAILABLE || primitive == PURPLE_STATUS_INVISIBLE) |
4822 { | 4822 { |
4823 /* This is needed for us to un-set any previous away message. */ | 4823 /* This is needed for us to un-set any previous away message. */ |
4824 away = g_strdup(""); | 4824 away = g_strdup(""); |
4825 } | 4825 } |
4826 else | 4826 else |
5057 va_end(ap); | 5057 va_end(ap); |
5058 | 5058 |
5059 purple_debug_error("oscar", "ssi: SNAC error %hu\n", reason); | 5059 purple_debug_error("oscar", "ssi: SNAC error %hu\n", reason); |
5060 | 5060 |
5061 if (reason == 0x0005) { | 5061 if (reason == 0x0005) { |
5062 purple_notify_error(gc, NULL, _("Unable to Retrieve Buddy List"), | |
5063 _("The AIM servers were temporarily unable to send your buddy list. Your buddy list is not lost, and will probably become available in a few minutes.")); | |
5064 if (od->getblisttimer > 0) | 5062 if (od->getblisttimer > 0) |
5065 purple_timeout_remove(od->getblisttimer); | 5063 purple_timeout_remove(od->getblisttimer); |
5064 else | |
5065 /* We only show this error the first time it happens */ | |
5066 purple_notify_error(gc, NULL, | |
5067 _("Unable to Retrieve Buddy List"), | |
5068 _("The AIM servers were temporarily unable to send " | |
5069 "your buddy list. Your buddy list is not lost, and " | |
5070 "will probably become available in a few minutes.")); | |
5066 od->getblisttimer = purple_timeout_add(30000, purple_ssi_rerequestdata, od); | 5071 od->getblisttimer = purple_timeout_add(30000, purple_ssi_rerequestdata, od); |
5067 return 1; | 5072 return 1; |
5068 } | 5073 } |
5069 | 5074 |
5070 oscar_set_status_icq(purple_connection_get_account(gc)); | 5075 oscar_set_status_icq(purple_connection_get_account(gc)); |