Mercurial > pidgin
changeset 28976:ef1c3791ad32
merge of '1042c695d02b49cb9360bb4ef591c4ff3209c5e5'
and '46f6d47a97be4bbe0262771c328eda1419d62542'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Thu, 04 Feb 2010 23:03:24 +0000 |
| parents | d73ec122554d (current diff) 52fffd4cdd62 (diff) |
| children | e137c1fc216a 61ea136df111 |
| files | |
| diffstat | 3 files changed, 31 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/libxmpp.c Thu Feb 04 22:43:47 2010 +0000 +++ b/libpurple/protocols/jabber/libxmpp.c Thu Feb 04 23:03:24 2010 +0000 @@ -431,7 +431,7 @@ jabber_data_init(); jabber_bosh_init(); - #warning implement adding and retrieving own features via IPC API + /* TODO: Implement adding and retrieving own features via IPC API */ jabber_ibb_init(); jabber_si_init();
--- a/libpurple/protocols/myspace/myspace.c Thu Feb 04 22:43:47 2010 +0000 +++ b/libpurple/protocols/myspace/myspace.c Thu Feb 04 23:03:24 2010 +0000 @@ -2264,6 +2264,13 @@ } } +static void +msim_buddy_free(PurpleBuddy *buddy) +{ + msim_user_free(purple_buddy_get_protocol_data(buddy)); + purple_buddy_set_protocol_data(buddy, NULL); +} + /** * Close the connection. * @@ -2272,8 +2279,20 @@ static void msim_close(PurpleConnection *gc) { + GSList *buddies; MsimSession *session; + /* + * Free our protocol-specific buddy data. It almost seems like libpurple + * should call our buddy_free prpl callback so that we don't need to do + * this... but it doesn't, so we do. + */ + buddies = purple_blist_get_buddies(); + while (buddies != NULL) { + msim_buddy_free(buddies->data); + buddies = g_slist_delete_link(buddies, buddies); + } + if (gc == NULL) { return; } @@ -2734,13 +2753,6 @@ msim_update_blocklist_for_buddy(session, name, TRUE, FALSE); } -static void -msim_buddy_free(PurpleBuddy *buddy) -{ - msim_user_free(purple_buddy_get_protocol_data(buddy)); - purple_buddy_set_protocol_data(buddy, NULL); -} - /** * Remove a buddy from the user's buddy list. */
--- a/po/de.po Thu Feb 04 22:43:47 2010 +0000 +++ b/po/de.po Thu Feb 04 23:03:24 2010 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-24 23:42+0100\n" -"PO-Revision-Date: 2010-01-24 23:42+0100\n" +"POT-Creation-Date: 2010-02-04 11:33+0100\n" +"PO-Revision-Date: 2010-02-04 11:32+0100\n" "Last-Translator: Björn Voigt <bjoern@cs.tu-berlin.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -4742,6 +4742,11 @@ msgid "(Code %s)" msgstr "(Code %s)" +msgid "A custom smiley in the message is too large to send." +msgstr "" +"Ein benutzerdefinierter Smiley in der Nachricht ist zu groß, um gesendet zu " +"werden." + msgid "XML Parse error" msgstr "Fehler beim Einlesen von XML-Daten" @@ -6797,7 +6802,10 @@ msgid "Server port" msgstr "Server-Port" -#. Note to translators: %s in this string is a URL +#, c-format +msgid "Received unexpected response from %s: %s" +msgstr "Unerwartete Antwort von %s erhalten: %s" + #, c-format msgid "Received unexpected response from %s" msgstr "Unerwartete Antwort von %s erhalten" @@ -7394,14 +7402,6 @@ "[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ungültige " "Zeichen enthält.]" -msgid "" -"The last action you attempted could not be performed because you are over " -"the rate limit. Please wait 10 seconds and try again.\n" -msgstr "" -"Die letzte gewünschte Aktion konnte nicht durchgeführt werden, da die " -"Senderate überschritten wurde. Bitte warten Sie 10 Sekunden und versuchen " -"Sie es erneut.\n" - #, c-format msgid "You have been disconnected from chat room %s." msgstr "Die Verbindung zum Raum %s wurde unterbrochen."