Mercurial > pidgin.yaz
changeset 27788:9cd7baa0627e
propagate from branch 'im.pidgin.pidgin' (head 6e57c4c3ef7f3cc9df8b67e8897a30bbe0405817)
to branch 'im.pidgin.pidgin.yaz' (head 490506ec23af59278efb862e28035688b8bbadf1)
| author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
|---|---|
| date | Sat, 08 Mar 2008 14:22:30 +0000 |
| parents | f2167b8f91ef (current diff) 49976f4b5005 (diff) |
| children | 9f67f9a58564 |
| files | libpurple/protocols/oscar/oscar.c pidgin/gtkconv.c |
| diffstat | 11 files changed, 118 insertions(+), 69 deletions(-) [+] |
line wrap: on
line diff
--- a/COPYRIGHT Thu Mar 06 15:43:12 2008 +0000 +++ b/COPYRIGHT Sat Mar 08 14:22:30 2008 +0000 @@ -403,6 +403,7 @@ Tom Tromey Todd Troxell Brad Turcotte +Kyle Turman Junichi Uekawa Igor Vlasenko István Váradi
--- a/ChangeLog Thu Mar 06 15:43:12 2008 +0000 +++ b/ChangeLog Sat Mar 08 14:22:30 2008 +0000 @@ -1,6 +1,33 @@ Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul +version 2.4.1 (): + http://developer.pidgin.im/query?status=closed&milestone=2.4.1 + + libpurple: + * Treat AIM Unicode messages as UTF-16 rather than UCS-2; this + should have no functional effect, other than continued support + on systems which have dropped UCS-2 conversions. + * Add support for setting buddy icons on Gadu-Gadu (Tomasz Salacinski) + * Fix a crash when clearing the buddy icon for an account on XMPP + * Fix a crash during login for some ICQ accounts + * Prefer more available resources on XMPP when priorities are equal + * Fix incorrectly marking some Yahoo! contacts as blocked + * Improved handling of UTF-8 group names on ICQ (beret) + * Fix a crash when starting if you have a Zephyr account + + Pidgin: + * Remove a workaround for older versions gstreamer that was causing + crashes on some non-Linux systems such as HPUX + * Fix some cases of the conversation input entry area being 1 pixel high + + Finch: + * Fix compiling with Glib older than 2.6 + * Ensure existing conversations selected from the 'Send IM' dialog are + given focus + version 2.4.0 (02/29/2008): + http://developer.pidgin.im/query?status=closed&milestone=2.4.0 + libpurple: * Added support for offline messages for AIM accounts (thanks to Matthew Goldstein)
--- a/finch/gntblist.c Thu Mar 06 15:43:12 2008 +0000 +++ b/finch/gntblist.c Sat Mar 08 14:22:30 2008 +0000 @@ -2610,11 +2610,13 @@ { PurpleAccount *account; const char *username; + PurpleConversation *conv; account = purple_request_fields_get_account(fields, "account"); username = purple_request_fields_get_string(fields, "screenname"); - purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username); + conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, username); + purple_conversation_present(conv); } static void
--- a/finch/gntconv.c Thu Mar 06 15:43:12 2008 +0000 +++ b/finch/gntconv.c Sat Mar 08 14:22:30 2008 +0000 @@ -293,7 +293,7 @@ g_free(str); scroll = gnt_text_view_get_lines_below(GNT_TEXT_VIEW(ggc->tv)); - str = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_name(conv)); + str = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_title(conv)); /* Updating is a little buggy. So just remove and add a new one */ gnt_text_view_tag_change(GNT_TEXT_VIEW(ggc->tv), "typing", NULL, TRUE); gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggc->tv), @@ -660,8 +660,10 @@ PurpleAccount *account; PurpleBlistNode *convnode = NULL; - if (ggc) + if (ggc) { + gnt_window_present(ggc->window); return; + } account = purple_conversation_get_account(conv); cc = find_conv_with_contact(account, purple_conversation_get_name(conv)); @@ -877,7 +879,7 @@ if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM && purple_conv_im_get_typing_state(PURPLE_CONV_IM(conv)) == PURPLE_TYPING) { - strip = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_name(conv)); + strip = g_strdup_printf(_("\n%s is typing..."), purple_conversation_get_title(conv)); gnt_text_view_append_text_with_tag(GNT_TEXT_VIEW(ggconv->tv), strip, GNT_TEXT_FLAG_DIM, "typing"); g_free(strip);
--- a/finch/gntsound.c Thu Mar 06 15:43:12 2008 +0000 +++ b/finch/gntsound.c Sat Mar 08 14:22:30 2008 +0000 @@ -358,6 +358,11 @@ #ifdef USE_GSTREAMER purple_debug_info("sound", "Initializing sound output drivers.\n"); +#if (GST_VERSION_MAJOR > 0 || \ + (GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR > 10) || \ + (GST_VERSION_MAJOR == 0 && GST_VERSION_MINOR == 10 && GST_VERSION_MICRO >= 10)) + gst_registry_fork_set_enabled(FALSE); +#endif if ((gst_init_failed = !gst_init_check(NULL, NULL, &error))) { purple_notify_error(NULL, _("GStreamer Failure"), _("GStreamer failed to initialize."),
--- a/finch/libgnt/gntentry.c Thu Mar 06 15:43:12 2008 +0000 +++ b/finch/libgnt/gntentry.c Sat Mar 08 14:22:30 2008 +0000 @@ -419,7 +419,7 @@ } static gboolean -history_prev(GntBindable *bind, GList *null) +history_next(GntBindable *bind, GList *null) { GntEntry *entry = GNT_ENTRY(bind); if (entry->histlength && entry->history->prev) @@ -436,7 +436,7 @@ } static gboolean -history_next(GntBindable *bind, GList *null) +history_prev(GntBindable *bind, GList *null) { GntEntry *entry = GNT_ENTRY(bind); if (entry->histlength && entry->history->next) @@ -904,10 +904,12 @@ GNT_KEY_DOWN, NULL); gnt_bindable_class_register_action(bindable, "suggest-prev", suggest_prev, GNT_KEY_UP, NULL); - gnt_bindable_class_register_action(bindable, "history-prev", history_prev, + gnt_bindable_class_register_action(bindable, "history-next", history_next, GNT_KEY_CTRL_DOWN, NULL); - gnt_bindable_class_register_action(bindable, "history-next", history_next, + gnt_bindable_class_register_action(bindable, "history-prev", history_prev, GNT_KEY_CTRL_UP, NULL); + gnt_bindable_register_binding(bindable, "history-prev", GNT_KEY_CTRL_P, NULL); + gnt_bindable_register_binding(bindable, "history-next", GNT_KEY_CTRL_N, NULL); gnt_bindable_class_register_action(bindable, "clipboard-paste", clipboard_paste, GNT_KEY_CTRL_V, NULL);
--- a/libpurple/protocols/oscar/family_locate.c Thu Mar 06 15:43:12 2008 +0000 +++ b/libpurple/protocols/oscar/family_locate.c Sat Mar 08 14:22:30 2008 +0000 @@ -1031,7 +1031,7 @@ * restricted to a few choices. I am currently aware of: * * us-ascii Just that - * unicode-2-0 UCS2-BE + * unicode-2-0 UTF-16BE * * profile_len and awaymsg_len MUST be set similarly, and they MUST * be the length of their respective strings in bytes.
--- a/libpurple/protocols/oscar/oscar.c Thu Mar 06 15:43:12 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.c Sat Mar 08 14:22:30 2008 +0000 @@ -245,7 +245,7 @@ } /* - * Must we send this message as UNICODE (in the UCS-2BE encoding)? + * Must we send this message as UNICODE (in the UTF-16BE encoding)? */ while (utf8[i]) { @@ -332,15 +332,15 @@ } else if (!g_ascii_strcasecmp(encoding, "unicode-2-0")) { /* Some official ICQ clients are apparently total crack, * and have been known to save a UTF-8 string converted - * from the locale character set to UCS-2 (not from UTF-8 - * to UCS-2!) in the away message. This hack should find + * from the locale character set to UTF-16 (not from UTF-8 + * to UTF-16!) in the away message. This hack should find * and do something (un)reasonable with that, and not * mess up too much else. */ const gchar *charset = purple_account_get_string(account, "encoding", NULL); sanitize_ucs((gchar *)text, textlen); if (charset) { gsize len; - utf8 = g_convert(text, textlen, charset, "UCS-2BE", &len, NULL, NULL); + utf8 = g_convert(text, textlen, charset, "UTF-16BE", &len, NULL, NULL); if (!utf8 || len != textlen || !g_utf8_validate(utf8, -1, NULL)) { g_free(utf8); utf8 = NULL; @@ -349,7 +349,7 @@ } } if (!utf8) - utf8 = g_convert(text, textlen, "UTF-8", "UCS-2BE", NULL, NULL, NULL); + utf8 = g_convert(text, textlen, "UTF-8", "UTF-16BE", NULL, NULL, NULL); } else if (g_ascii_strcasecmp(encoding, "utf-8")) { purple_debug_warning("oscar", "Unrecognized character encoding \"%s\", " "attempting to convert to UTF-8 anyway\n", encoding); @@ -442,7 +442,7 @@ return NULL; if (charset == AIM_CHARSET_UNICODE) { - charsetstr1 = "UCS-2BE"; + charsetstr1 = "UTF-16BE"; charsetstr2 = "UTF-8"; } else if (charset == AIM_CHARSET_CUSTOM) { if ((sourcesn != NULL) && aim_snvalid_icq(sourcesn)) @@ -514,7 +514,7 @@ * If we're sending to an ICQ user, and they are in our * buddy list, and they are advertising the Unicode * capability, and they are online, then attempt to send - * as UCS-2BE. + * as UTF-16BE. */ if ((destsn != NULL) && aim_snvalid_icq(destsn)) userinfo = aim_locate_finduserinfo(od, destsn); @@ -525,7 +525,7 @@ b = purple_find_buddy(account, destsn); if ((b != NULL) && (PURPLE_BUDDY_IS_ONLINE(b))) { - *msg = g_convert(from, strlen(from), "UCS-2BE", "UTF-8", NULL, &msglen, NULL); + *msg = g_convert(from, strlen(from), "UTF-16BE", "UTF-8", NULL, &msglen, NULL); botch_ucs(*msg, msglen); if (*msg != NULL) { @@ -558,9 +558,9 @@ } /* - * Nothing else worked, so send as UCS-2BE. + * Nothing else worked, so send as UTF-16BE. */ - *msg = g_convert(from, strlen(from), "UCS-2BE", "UTF-8", NULL, &msglen, &err); + *msg = g_convert(from, strlen(from), "UTF-16BE", "UTF-8", NULL, &msglen, &err); botch_ucs(*msg, msglen); if (*msg != NULL) { *charset = AIM_CHARSET_UNICODE; @@ -4462,7 +4462,7 @@ charset = oscar_charset_check(str); if (charset == AIM_CHARSET_UNICODE) { - encoded = g_convert(str, strlen(str), "UCS-2BE", "UTF-8", NULL, ret_len, NULL); + encoded = g_convert(str, strlen(str), "UTF-16BE", "UTF-8", NULL, ret_len, NULL); botch_ucs(encoded, *ret_len); *encoding = "unicode-2-0"; } else if (charset == AIM_CHARSET_CUSTOM) {
--- a/libpurple/protocols/oscar/oscar.h Thu Mar 06 15:43:12 2008 +0000 +++ b/libpurple/protocols/oscar/oscar.h Sat Mar 08 14:22:30 2008 +0000 @@ -754,7 +754,7 @@ #define AIM_IMFLAGS_TYPINGNOT 0x1000 /* typing notification */ #define AIM_CHARSET_ASCII 0x0000 -#define AIM_CHARSET_UNICODE 0x0002 /* UCS-2BE */ +#define AIM_CHARSET_UNICODE 0x0002 /* UTF-16BE */ #define AIM_CHARSET_CUSTOM 0x0003 /*
--- a/pidgin/gtkconv.c Thu Mar 06 15:43:12 2008 +0000 +++ b/pidgin/gtkconv.c Sat Mar 08 14:22:30 2008 +0000 @@ -4836,6 +4836,8 @@ g_signal_connect_swapped(G_OBJECT(gtkconv->entry_buffer), "changed", G_CALLBACK(resize_imhtml_cb), gtkconv); + g_signal_connect_swapped(G_OBJECT(gtkconv->entry), "realize", + G_CALLBACK(resize_imhtml_cb), gtkconv); default_formatize(gtkconv); g_signal_connect_after(G_OBJECT(gtkconv->entry), "format_function_clear", @@ -5113,8 +5115,6 @@ else gtk_widget_hide(gtkconv->toolbar); -// g_idle_add((GSourceFunc)resize_imhtml_cb, gtkconv); - if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons")) gtk_widget_show(gtkconv->infopane_hbox); else
--- a/po/de.po Thu Mar 06 15:43:12 2008 +0000 +++ b/po/de.po Sat Mar 08 14:22:30 2008 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-24 19:28+0100\n" -"PO-Revision-Date: 2008-02-24 19:28+0100\n" +"POT-Creation-Date: 2008-03-07 21:51+0100\n" +"PO-Revision-Date: 2008-03-07 21:51+0100\n" "Last-Translator: Jochen Kemnade <jochenkemnade@web.de>\n" "Language-Team: Deutsch <de@li.org>\n" "MIME-Version: 1.0\n" @@ -6220,7 +6220,7 @@ "Verbindung zum BOS-Server nicht möglich\n" "%s" -msgid "Screen name sent" +msgid "Username sent" msgstr "Benutzername gesendet" msgid "Connection established, cookie sent" @@ -6232,9 +6232,9 @@ #, c-format msgid "" -"Unable to login: Could not sign on as %s because the screen name is " -"invalid. Screen names must be a valid email address, or start with a letter " -"and contain only letters, numbers and spaces, or contain only numbers." +"Unable to login: Could not sign on as %s because the username is invalid. " +"Usernames must be a valid email address, or start with a letter and contain " +"only letters, numbers and spaces, or contain only numbers." msgstr "" "Anmeldung fehlgeschlagen: Sie konnten nicht als %s angemeldet werden, da der " "Benutzername fehlerhaft ist. Benutzernamen müssen gültige E-Mail-Adressen " @@ -6242,7 +6242,7 @@ "Leerzeichen enthalten oder nur aus Ziffern bestehen." #. Unregistered screen name -msgid "Invalid screen name." +msgid "Invalid username." msgstr "Ungültiger Benutzername." msgid "Incorrect password." @@ -6530,14 +6530,11 @@ msgstr "Pop-Up Nachricht" #, c-format -msgid "The following screen name is associated with %s" -msgid_plural "The following screen names are associated with %s" +msgid "The following username is associated with %s" +msgid_plural "The following usernames are associated with %s" msgstr[0] "Die folgende Benutzername ist verbunden mit %s" msgstr[1] "Die folgenden Benutzernamen sind verbunden mit %s" -msgid "Screen name" -msgstr "Benutzername" - #, c-format msgid "No results found for e-mail address %s" msgstr "Keine Ergebnisse für die E-Mail-Adresse %s gefunden" @@ -6551,27 +6548,24 @@ msgid "Account Confirmation Requested" msgstr "Kontobestätigung wurde angefragt" -msgid "Error Changing Account Info" -msgstr "Fehler beim Ändern der Konten-Information" - -#, c-format -msgid "" -"Error 0x%04x: Unable to format screen name because the requested screen name " -"differs from the original." -msgstr "" -"Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom " -"Original abweicht." - -#, c-format -msgid "Error 0x%04x: Unable to format screen name because it is invalid." +#, c-format +msgid "" +"Error 0x%04x: Unable to format username because the requested name differs " +"from the original." +msgstr "" +"Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der geforderte " +"Name vom Original abweicht." + +#, c-format +msgid "Error 0x%04x: Unable to format username because it is invalid." msgstr "" "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil er ungültig " "ist." #, c-format msgid "" -"Error 0x%04x: Unable to format screen name because the requested screen name " -"is too long." +"Error 0x%04x: Unable to format username because the requested name is too " +"long." msgstr "" "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu " "lang ist." @@ -6579,7 +6573,7 @@ #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because there is already a " -"request pending for this screen name." +"request pending for this username." msgstr "" "Error 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon eine " "laufende Anfrage für diesen Benutzernamen gibt." @@ -6587,10 +6581,10 @@ #, c-format msgid "" "Error 0x%04x: Unable to change e-mail address because the given address has " -"too many screen names associated with it." -msgstr "" -"Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil es schon zu viele " -"E-Mail-Adressen gibt, die zum Benutzernamen gehören." +"too many usernames associated with it." +msgstr "" +"Fehler 0x%04x: Kann die E-Mail-Adresse nicht ändern, weil zu dieser Adresse " +"schon zu viele Benutzernamen gehören." #, c-format msgid "" @@ -6604,6 +6598,9 @@ msgid "Error 0x%04x: Unknown error." msgstr "Fehler 0x%04x: Unbekannter Fehler." +msgid "Error Changing Account Info" +msgstr "Fehler beim Ändern der Konten-Information" + #, c-format msgid "The e-mail address for %s is %s" msgstr "Die E-Mail-Adresse für %s ist %s" @@ -6665,9 +6662,9 @@ #, c-format msgid "" -"Could not add the buddy %s because the screen name is invalid. Screen names " -"must be a valid email address, or start with a letter and contain only " -"letters, numbers and spaces, or contain only numbers." +"Could not add the buddy %s because the username is invalid. Usernames must " +"be a valid email address, or start with a letter and contain only letters, " +"numbers and spaces, or contain only numbers." msgstr "" "Konnte den Buddy %s nicht hinzufügen, da der Benutzername falsch ist. " "Benutzernamen müssen gültige E-Mail-Adressen sein oder mit einem Buchstaben " @@ -6806,7 +6803,7 @@ msgid "The new formatting is invalid." msgstr "Die neue Formatierung ist ungültig." -msgid "Screen name formatting can change only capitalization and whitespace." +msgid "Username formatting can change only capitalization and whitespace." msgstr "" "Benutzernamen-Formatierung kann nur die Groß-/Kleinschreibung und " "Leerzeichen ändern." @@ -9122,6 +9119,9 @@ msgid "Ignore buddy?" msgstr "Buddy ignorieren?" +msgid "Invalid screen name." +msgstr "Ungültiger Benutzername." + msgid "Your account is locked, please log in to the Yahoo! website." msgstr "" "Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an." @@ -10964,6 +10964,9 @@ msgid "Serbian" msgstr "Serbisch" +msgid "Sinhala" +msgstr "Singhalesisch" + msgid "Swedish" msgstr "Schwedisch" @@ -11556,8 +11559,9 @@ " -h, --help display this help and exit\n" " -m, --multiple do not ensure single instance\n" " -n, --nologin don't automatically login\n" -" -l, --login[=NAME] automatically login (optional argument NAME specifies\n" -" account(s) to use, separated by commas)\n" +" -l, --login[=NAME] enable specified account(s) (optional argument NAME\n" +" specifies account(s) to use, separated by commas.\n" +" Without this only the first account will be enabled).\n" " --display=DISPLAY X display to use\n" " -v, --version display the current version and exit\n" msgstr "" @@ -11569,9 +11573,10 @@ " -h, --help zeigt diese Hilfe und beendet das Programm\n" " -m, --multiple mehrere Instanzen erlauben\n" " -n, --nologin nicht automatisch anmelden\n" -" -l, --login[=NAME] automatische Anmeldung (optionales Argument \n" -" NAME bestimmt Konto(n), die benutzt werden\n" -" sollen, getrennt durch Kommata)\n" +" -l, --login[=NAME] angegebene Konten aktivieren (optionales Argument\n" +" NAME bestimmt Konto(n), die benutzt werden sollen,\n" +" getrennt durch Kommata. Ohne diesen Parameter wird\n" +" nur das erste Konto aktiviert).\n" " --display=DISPLAY zu benutzendes X-Display\n" " -v, --version zeigt aktuelle Version und beendet das Programm\n" @@ -11585,8 +11590,9 @@ " -h, --help display this help and exit\n" " -m, --multiple do not ensure single instance\n" " -n, --nologin don't automatically login\n" -" -l, --login[=NAME] automatically login (optional argument NAME specifies\n" -" account(s) to use, separated by commas)\n" +" -l, --login[=NAME] enable specified account(s) (optional argument NAME\n" +" specifies account(s) to use, separated by commas.\n" +" Without this only the first account will be enabled).\n" " -v, --version display the current version and exit\n" msgstr "" "%s %s\n" @@ -11597,9 +11603,10 @@ " -h, --help zeigt diese Hilfe und beendet das Programm\n" " -m, --multiple mehrere Instanzen erlauben\n" " -n, --nologin nicht automatisch anmelden\n" -" -l, --login[=NAME] automatische Anmeldung (optionales Argument \n" -" NAME bestimmt Konto(n), die benutzt werden\n" -" sollen, getrennt durch Kommata)\n" +" -l, --login[=NAME] angegebene Konten aktivieren (optionales Argument\n" +" NAME bestimmt Konto(n), die benutzt werden sollen,\n" +" getrennt durch Kommata. Ohne diesen Parameter wird\n" +" nur das erste Konto aktiviert).\n" " -v, --version zeigt aktuelle Version und beendet das Programm\n" #, c-format @@ -11719,6 +11726,9 @@ "<span foreground=\"#ff0000\" weight=\"bold\">Fehler: %s\n" "Überprüfen Sie die Website des Plugins auf eine neue Version.</span>" +msgid "Author" +msgstr "Autor" + msgid "Configure Pl_ugin" msgstr "Pl_ugin konfigurieren"