Mercurial > pidgin
changeset 24923:b15168f2b7ee
merge of '479fd75025803f01e743b5c39e6706b1d42a3520'
and 'f5f0cca8a5f385b7c637236b48aceef1aaa97899'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Tue, 06 Jan 2009 22:41:16 +0000 |
| parents | 61f3a9f7a220 (diff) cead8692e35f (current diff) |
| children | 380e7149a777 |
| files | libpurple/protocols/myspace/myspace.c |
| diffstat | 12 files changed, 42 insertions(+), 151 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Tue Jan 06 19:50:18 2009 +0000 +++ b/COPYRIGHT Tue Jan 06 22:41:16 2009 +0000 @@ -212,6 +212,7 @@ John Kelm Jochen Kemnade Akuke Kok +Kir Kolyshkin Konstantin Korikov Cole Kowalski Matt Kramer
--- a/libpurple/dbus-server.c Tue Jan 06 19:50:18 2009 +0000 +++ b/libpurple/dbus-server.c Tue Jan 06 22:41:16 2009 +0000 @@ -803,6 +803,8 @@ void purple_dbus_init(void) { + dbus_g_thread_init(); + purple_dbus_init_ids(); g_free(init_error);
--- a/libpurple/dnsquery.c Tue Jan 06 19:50:18 2009 +0000 +++ b/libpurple/dnsquery.c Tue Jan 06 22:41:16 2009 +0000 @@ -274,7 +274,6 @@ res = res->ai_next; } freeaddrinfo(tmp); - write_to_parent(child_out, &zero, sizeof(zero)); #else if (!inet_aton(dns_params.hostname, &sin.sin_addr)) { struct hostent *hp; @@ -292,11 +291,12 @@ sin.sin_family = AF_INET; sin.sin_port = htons(dns_params.port); - write_to_parent(child_out, &zero, sizeof(zero)); + rc = 0; + write_to_parent(child_out, &rc, sizeof(rc)); write_to_parent(child_out, &addrlen, sizeof(addrlen)); write_to_parent(child_out, &sin, addrlen); +#endif write_to_parent(child_out, &zero, sizeof(zero)); -#endif dns_params.hostname[0] = '\0'; }
--- a/libpurple/ft.c Tue Jan 06 19:50:18 2009 +0000 +++ b/libpurple/ft.c Tue Jan 06 22:41:16 2009 +0000 @@ -700,7 +700,7 @@ msg = g_strdup_printf(_("Transfer of file %s complete"), purple_xfer_get_filename(xfer)); else - msg = g_strdup_printf(_("File transfer complete")); + msg = g_strdup(_("File transfer complete")); purple_xfer_conversation_write(xfer, msg, FALSE); g_free(msg); } @@ -1140,7 +1140,7 @@ } else { - msg = g_strdup_printf(_("File transfer cancelled")); + msg = g_strdup(_("File transfer cancelled")); } purple_xfer_conversation_write(xfer, msg, FALSE); g_free(msg);
--- a/libpurple/plugin.c Tue Jan 06 19:50:18 2009 +0000 +++ b/libpurple/plugin.c Tue Jan 06 22:41:16 2009 +0000 @@ -374,7 +374,7 @@ */ if (plugin->info->id == NULL || *plugin->info->id == '\0') { - plugin->error = g_strdup_printf(_("This plugin has not defined an ID.")); + plugin->error = g_strdup(_("This plugin has not defined an ID.")); purple_debug_error("plugins", "%s is not loadable: info->id is not defined.\n", plugin->path); plugin->unloadable = TRUE; return plugin;
--- a/libpurple/protocols/myspace/myspace.c Tue Jan 06 19:50:18 2009 +0000 +++ b/libpurple/protocols/myspace/myspace.c Tue Jan 06 22:41:16 2009 +0000 @@ -533,7 +533,7 @@ guchar hash_pw[HASH_SIZE]; guchar key[HASH_SIZE]; - gchar *password_utf16le, *password_utf8_lc; + gchar *password_truncated, *password_utf16le, *password_utf8_lc; GString *data; guchar *data_out; size_t data_out_len; @@ -548,10 +548,19 @@ g_return_val_if_fail(password != NULL, NULL); g_return_val_if_fail(response_len != NULL, NULL); + /* + * Truncate password to 10 characters. Their "change password" + * web page doesn't let you enter more than 10 characters, but you + * can enter more than 10 when logging in on myspace.com and they + * truncate it. + */ + password_truncated = g_strndup(password, 10); + /* Convert password to lowercase (required for passwords containing * uppercase characters). MySpace passwords are lowercase, * see ticket #2066. */ - password_utf8_lc = g_utf8_strdown(password, -1); + password_utf8_lc = g_utf8_strdown(password_truncated, -1); + g_free(password_truncated); /* Convert ASCII password to UTF16 little endian */ purple_debug_info("msim", "converting password to UTF-16LE\n"); @@ -560,8 +569,6 @@ &conv_bytes_read, &conv_bytes_written, &conv_error); g_free(password_utf8_lc); - g_return_val_if_fail(conv_bytes_read == strlen(password), NULL); - if (conv_error != NULL) { purple_debug_error("msim", "g_convert password UTF8->UTF16LE failed: %s",
--- a/libpurple/protocols/novell/novell.c Tue Jan 06 19:50:18 2009 +0000 +++ b/libpurple/protocols/novell/novell.c Tue Jan 06 22:41:16 2009 +0000 @@ -2519,8 +2519,8 @@ /* The conference was not found, must be closed */ chat = purple_find_chat(gc, id); if (chat) { - str = g_strdup_printf(_("This conference has been closed." - " No more messages can be sent.")); + str = g_strdup(_("This conference has been closed." + " No more messages can be sent.")); purple_conversation_write(chat, NULL, str, PURPLE_MESSAGE_SYSTEM, time(NULL)); g_free(str); }
--- a/libpurple/protocols/oscar/oscar.c Tue Jan 06 19:50:18 2009 +0000 +++ b/libpurple/protocols/oscar/oscar.c Tue Jan 06 22:41:16 2009 +0000 @@ -739,21 +739,21 @@ static char *oscar_icqstatus(int state) { /* Make a cute little string that shows the status of the dude or dudet */ if (state & AIM_ICQ_STATE_CHAT) - return g_strdup_printf(_("Free For Chat")); + return g_strdup(_("Free For Chat")); else if (state & AIM_ICQ_STATE_DND) - return g_strdup_printf(_("Do Not Disturb")); + return g_strdup(_("Do Not Disturb")); else if (state & AIM_ICQ_STATE_OUT) - return g_strdup_printf(_("Not Available")); + return g_strdup(_("Not Available")); else if (state & AIM_ICQ_STATE_BUSY) - return g_strdup_printf(_("Occupied")); + return g_strdup(_("Occupied")); else if (state & AIM_ICQ_STATE_AWAY) - return g_strdup_printf(_("Away")); + return g_strdup(_("Away")); else if (state & AIM_ICQ_STATE_WEBAWARE) - return g_strdup_printf(_("Web Aware")); + return g_strdup(_("Web Aware")); else if (state & AIM_ICQ_STATE_INVISIBLE) - return g_strdup_printf(_("Invisible")); + return g_strdup(_("Invisible")); else - return g_strdup_printf(_("Online")); + return g_strdup(_("Online")); } static void
--- a/libpurple/protocols/oscar/peer.c Tue Jan 06 19:50:18 2009 +0000 +++ b/libpurple/protocols/oscar/peer.c Tue Jan 06 22:41:16 2009 +0000 @@ -859,7 +859,7 @@ { gchar *tmp; PurpleConversation *conv; - tmp = g_strdup_printf(_("Attempting to connect via proxy server.")); + tmp = g_strdup(_("Attempting to connect via proxy server.")); conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, conn->sn); purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
--- a/po/ca.po Tue Jan 06 19:50:18 2009 +0000 +++ b/po/ca.po Tue Jan 06 22:41:16 2009 +0000 @@ -34,7 +34,7 @@ "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2009-01-05 01:42+0100\n" -"PO-Revision-Date: 2009-01-05 01:44+0100\n" +"PO-Revision-Date: 2009-01-05 20:36+0100\n" "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n" "Language-Team: Catalan <tradgnome@softcatala.net>\n" "MIME-Version: 1.0\n" @@ -14756,9 +14756,6 @@ #~ "Podeu obtenir la versió %s de:<br><a href=\"http://pidgin.im/\">http://" #~ "pidgin.im</a>." -#~ msgid "WinGaim Options" -#~ msgstr "Opcions del WinGaim" - #~ msgid "" #~ "%d buddy from group %s was not removed because it belongs to an account " #~ "which is disabled or offline. This buddy and the group were not " @@ -16018,62 +16015,18 @@ #~ msgid "Error communicating with Gadu-Gadu server" #~ msgstr "S'ha produït un error en comunicar amb el servidor Gadu-Gadu" -#~ msgid "" -#~ "Gaim was unable to complete your request due to a problem communicating " -#~ "with the Gadu-Gadu HTTP server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut completar la vostra petició perquè hi ha hagut un " -#~ "problema en la comunicació amb el servidor HTTP Gadu-Gadu. Torneu-ho a " -#~ "intentar més tard." - #~ msgid "Unable to import Gadu-Gadu buddy list" #~ msgstr "No s'ha pogut importar la llista d'amics de Gadu-Gadu" -#~ msgid "" -#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server. Please " -#~ "try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut connectar-se al servidor de llistes d'amics del Gadu-" -#~ "Gadu. Torneu-ho a intentar més tard." - -#~ msgid "" -#~ "Gaim was unable to connect to the buddy list server. Please try again " -#~ "later." -#~ msgstr "" -#~ "El Gaim no s'ha pogut connectar al servidor de llistes d'amics. Torneu-ho " -#~ "a intentar més tard." - #~ msgid "Unable to delete Gadu-Gadu buddy list" #~ msgstr "No s'ha pogut suprimir la llista d'amics de Gadu-Gadu" #~ msgid "Unable to access directory" #~ msgstr "No s'ha pogut accedir al directori" -#~ msgid "" -#~ "Gaim was unable to search the Directory because it was unable to connect " -#~ "to the directory server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut cercar al directori perquè no s'hi ha pogut " -#~ "connectar. Torneu-ho a intentar més tard." - -#~ msgid "" -#~ "Gaim was unable to change your password due to an error connecting to the " -#~ "Gadu-Gadu server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut canviar la contrasenya a causa d'un error mentre es " -#~ "comunicava amb el servidor Gadu-Gadu. Torneu-ho a intentar més tard." - #~ msgid "Unable to access user profile." #~ msgstr "No s'ha pogut accedir al perfil de l'usuari." -#~ msgid "" -#~ "Gaim was unable to access this user's profile due to an error connecting " -#~ "to the directory server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut accedir al perfil de l'usuari atès que s'ha produït " -#~ "un error en connectar-se al servidor de directori. Torneu-ho a intentar " -#~ "més tard." - #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them." #~ msgstr "L'usuari %s (%s%s%s%s%s) vol que l'autoritzeu." @@ -16215,13 +16168,6 @@ #~ msgid "/Buddies/Log Out" #~ msgstr "/Amics/Desconnecta" -#~ msgid "" -#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte " -#~ "(1,048,576 bytes)." -#~ msgstr "" -#~ "El Gaim no pot enviar fitxer a través de Yahoo! que siguin més grans d'un " -#~ "Megabyte (1.048.576 bytes)." - #~ msgid "Miscellaneous error" #~ msgstr "Error miscel·lani" @@ -16249,12 +16195,6 @@ #~ msgid "MSN error for account %s" #~ msgstr "S'ha produït un error MSN per al compte %s" -#~ msgid "Moving Gaim Settings.." -#~ msgstr "S'està movent les opcions del Gaim..." - -#~ msgid "Moving Gaim user settings to: " -#~ msgstr "S'està movent les opcions d'usuaris del Gaim a: " - #~ msgid "Notification" #~ msgstr "Notificació"
--- a/po/ca@valencia.po Tue Jan 06 19:50:18 2009 +0000 +++ b/po/ca@valencia.po Tue Jan 06 22:41:16 2009 +0000 @@ -34,7 +34,7 @@ "Project-Id-Version: Pidgin\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2008-12-19 17:53+0100\n" -"PO-Revision-Date: 2008-12-20 17:15+0100\n" +"PO-Revision-Date: 2009-01-05 20:36+0100\n" "Last-Translator: Josep Puigdemont i Casamajó <josep.puigdemont@gmail.com>\n" "Language-Team: Catalan <tradgnome@softcatala.net>\n" "MIME-Version: 1.0\n" @@ -14739,9 +14739,6 @@ #~ "Podeu obtenir la versió %s de:<br><a href=\"http://pidgin.im/\">http://" #~ "pidgin.im</a>." -#~ msgid "WinGaim Options" -#~ msgstr "Opcions del WinGaim" - #~ msgid "" #~ "%d buddy from group %s was not removed because it belongs to an account " #~ "which is disabled or offline. This buddy and the group were not " @@ -16001,62 +15998,18 @@ #~ msgid "Error communicating with Gadu-Gadu server" #~ msgstr "S'ha produït un error en comunicar amb el servidor Gadu-Gadu" -#~ msgid "" -#~ "Gaim was unable to complete your request due to a problem communicating " -#~ "with the Gadu-Gadu HTTP server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut completar la vostra petició perquè hi ha hagut un " -#~ "problema en la comunicació amb el servidor HTTP Gadu-Gadu. Torneu-ho a " -#~ "intentar més tard." - #~ msgid "Unable to import Gadu-Gadu buddy list" #~ msgstr "No s'ha pogut importar la llista d'amics de Gadu-Gadu" -#~ msgid "" -#~ "Gaim was unable to connect to the Gadu-Gadu buddy list server. Please " -#~ "try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut connectar-se al servidor de llistes d'amics del Gadu-" -#~ "Gadu. Torneu-ho a intentar més tard." - -#~ msgid "" -#~ "Gaim was unable to connect to the buddy list server. Please try again " -#~ "later." -#~ msgstr "" -#~ "El Gaim no s'ha pogut connectar al servidor de llistes d'amics. Torneu-ho " -#~ "a intentar més tard." - #~ msgid "Unable to delete Gadu-Gadu buddy list" #~ msgstr "No s'ha pogut suprimir la llista d'amics de Gadu-Gadu" #~ msgid "Unable to access directory" #~ msgstr "No s'ha pogut accedir al directori" -#~ msgid "" -#~ "Gaim was unable to search the Directory because it was unable to connect " -#~ "to the directory server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut cercar al directori perquè no s'hi ha pogut " -#~ "connectar. Torneu-ho a intentar més tard." - -#~ msgid "" -#~ "Gaim was unable to change your password due to an error connecting to the " -#~ "Gadu-Gadu server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut canviar la contrasenya a causa d'un error mentre es " -#~ "comunicava amb el servidor Gadu-Gadu. Torneu-ho a intentar més tard." - #~ msgid "Unable to access user profile." #~ msgstr "No s'ha pogut accedir al perfil de l'usuari." -#~ msgid "" -#~ "Gaim was unable to access this user's profile due to an error connecting " -#~ "to the directory server. Please try again later." -#~ msgstr "" -#~ "El Gaim no ha pogut accedir al perfil de l'usuari atès que s'ha produït " -#~ "un error en connectar-se al servidor de directori. Torneu-ho a intentar " -#~ "més tard." - #~ msgid "The user %s (%s%s%s%s%s) wants you to authorize them." #~ msgstr "L'usuari %s (%s%s%s%s%s) vol que l'autoritzeu." @@ -16198,13 +16151,6 @@ #~ msgid "/Buddies/Log Out" #~ msgstr "/Amics/Desconnecta" -#~ msgid "" -#~ "Gaim cannot send files over Yahoo! that are bigger than One Megabyte " -#~ "(1,048,576 bytes)." -#~ msgstr "" -#~ "El Gaim no pot enviar fitxer a través de Yahoo! que siguin més grans d'un " -#~ "Megabyte (1.048.576 bytes)." - #~ msgid "Miscellaneous error" #~ msgstr "Error miscel·lani" @@ -16232,12 +16178,6 @@ #~ msgid "MSN error for account %s" #~ msgstr "S'ha produït un error MSN per al compte %s" -#~ msgid "Moving Gaim Settings.." -#~ msgstr "S'està movent les opcions del Gaim..." - -#~ msgid "Moving Gaim user settings to: " -#~ msgstr "S'està movent les opcions d'usuaris del Gaim a: " - #~ msgid "Notification" #~ msgstr "Notificació"
--- a/po/de.po Tue Jan 06 19:50:18 2009 +0000 +++ b/po/de.po Tue Jan 06 22:41:16 2009 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-04 12:29+0100\n" -"PO-Revision-Date: 2009-01-04 12:29+0100\n" +"POT-Creation-Date: 2009-01-05 17:34+0100\n" +"PO-Revision-Date: 2009-01-05 17:34+0100\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" @@ -4168,6 +4168,9 @@ msgid "Re-initializing Stream" msgstr "Initialisiere Stream nochmal" +msgid "Server doesn't support blocking" +msgstr "Server unterstützt kein Blockieren" + msgid "Not Authorized" msgstr "Nicht autorisiert" @@ -6487,12 +6490,10 @@ msgstr "_OK" #, c-format -msgid "" -"You may be disconnected shortly. You may want to use TOC until this is " -"fixed. Check %s for updates." -msgstr "" -"Die Verbindung kann schnell unterbrochen werden. Vielleicht wollen Sie TOC " -"benutzen bis dieser Fehler behoben wurde. Suchen Sie auf %s nach Updates." +msgid "You may be disconnected shortly. If so, check %s for updates." +msgstr "" +"Sie werden eventuell gleich abgemeldet. In diesem Fall, überprüfen Sie %s " +"auf Updates." msgid "Unable to get a valid AIM login hash." msgstr "Konnte keinen gültigen AIM Login-Hash bekommen."