Mercurial > pidgin
changeset 23060:0830ab50c463
merge of '000a0fa4bca9f18691f0a61e01bbac1aa76437c1'
and '54416c3a9ed80862d700c73b4a62bffe02e23534'
| author | SHiNE CsyFeK <csyfek@gmail.com> |
|---|---|
| date | Sun, 29 Jun 2008 14:25:09 +0000 |
| parents | 7b7744995791 (diff) ebad75b719f5 (current diff) |
| children | 1008901e1d5c 92647292a8b1 |
| files | |
| diffstat | 13 files changed, 48 insertions(+), 82 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/idle.c Sun Jun 29 14:24:21 2008 +0000 +++ b/libpurple/idle.c Sun Jun 29 14:25:09 2008 +0000 @@ -252,7 +252,7 @@ PurpleAccount *account; account = purple_connection_get_account(gc); - idled_accts = g_list_remove(idled_accts, account); + set_account_unidle(account); } static void
--- a/libpurple/internal.h Sun Jun 29 14:24:21 2008 +0000 +++ b/libpurple/internal.h Sun Jun 29 14:25:09 2008 +0000 @@ -140,6 +140,14 @@ # define G_MAXUINT32 ((guint32) 0xffffffff) #endif +#ifndef G_MAXSIZE +# if GLIB_SIZEOF_LONG == 8 +# define G_MAXSIZE ((gsize) 0xffffffffffffffff) +# else +# define G_MAXSIZE ((gsize) 0xffffffff) +# endif +#endif + #if GLIB_CHECK_VERSION(2,6,0) # include <glib/gstdio.h> #endif
--- a/libpurple/protocols/msn/slplink.c Sun Jun 29 14:24:21 2008 +0000 +++ b/libpurple/protocols/msn/slplink.c Sun Jun 29 14:25:09 2008 +0000 @@ -593,7 +593,7 @@ } else if (slpmsg->size) { - if ((offset + len) > slpmsg->size) + if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size) { purple_debug_error("msn", "Oversized slpmsg - msgsize=%lld offset=%" G_GSIZE_FORMAT " len=%" G_GSIZE_FORMAT "\n",
--- a/libpurple/protocols/msnp9/slplink.c Sun Jun 29 14:24:21 2008 +0000 +++ b/libpurple/protocols/msnp9/slplink.c Sun Jun 29 14:25:09 2008 +0000 @@ -597,7 +597,7 @@ } else if (slpmsg->size) { - if ((offset + len) > slpmsg->size) + if (G_MAXSIZE - len < offset || (offset + len) > slpmsg->size) { purple_debug_error("msn", "Oversized slpmsg\n"); g_return_if_reached();
--- a/libpurple/protocols/silc/buddy.c Sun Jun 29 14:24:21 2008 +0000 +++ b/libpurple/protocols/silc/buddy.c Sun Jun 29 14:25:09 2008 +0000 @@ -1434,13 +1434,25 @@ void silcpurple_idle_set(PurpleConnection *gc, int idle) { - SilcPurple sg = gc->proto_data; - SilcClient client = sg->client; - SilcClientConnection conn = sg->conn; + SilcPurple sg; + SilcClient client; + SilcClientConnection conn; SilcAttributeObjService service; const char *server; int port; + sg = gc->proto_data; + if (sg == NULL) + return; + + client = sg->client; + if (client == NULL) + return; + + conn = sg->conn; + if (conn == NULL) + return; + server = purple_account_get_string(sg->account, "server", "silc.silcnet.org"); port = purple_account_get_int(sg->account, "port", 706),
--- a/libpurple/protocols/silc10/buddy.c Sun Jun 29 14:24:21 2008 +0000 +++ b/libpurple/protocols/silc10/buddy.c Sun Jun 29 14:25:09 2008 +0000 @@ -1434,13 +1434,25 @@ void silcpurple_idle_set(PurpleConnection *gc, int idle) { - SilcPurple sg = gc->proto_data; - SilcClient client = sg->client; - SilcClientConnection conn = sg->conn; + SilcPurple sg; + SilcClient client; + SilcClientConnection conn; SilcAttributeObjService service; const char *server; int port; + sg = gc->proto_data; + if (sg == NULL) + return; + + client = sg->client; + if (client == NULL) + return; + + conn = sg->conn; + if (conn == NULL) + return; + server = purple_account_get_string(sg->account, "server", "silc.silcnet.org"); port = purple_account_get_int(sg->account, "port", 706),
--- a/pidgin/gtkimhtml.c Sun Jun 29 14:24:21 2008 +0000 +++ b/pidgin/gtkimhtml.c Sun Jun 29 14:25:09 2008 +0000 @@ -950,19 +950,14 @@ char *selection; #ifndef _WIN32 gsize len; - GString *str = g_string_new(NULL); if (primary) { text = gtk_imhtml_get_markup_range(imhtml, &start, &end); } else text = html_clipboard; /* Mozilla asks that we start our text/html with the Unicode byte order mark */ - str = g_string_append_unichar(str, 0xfeff); - str = g_string_append(str, text); - str = g_string_append_unichar(str, 0x0000); - selection = g_convert(str->str, str->len, "UTF-16", "UTF-8", NULL, &len, NULL); + selection = g_convert(text, -1, "UTF-16", "UTF-8", NULL, &len, NULL); gtk_selection_data_set(selection_data, gdk_atom_intern("text/html", FALSE), 16, (const guchar *)selection, len); - g_string_free(str, TRUE); #else selection = clipboard_html_to_win32(html_clipboard); gtk_selection_data_set(selection_data, gdk_atom_intern("HTML Format", FALSE), 8, (const guchar *)selection, strlen(selection));
--- a/pidgin/win32/nsis/pidgin-installer.nsi Sun Jun 29 14:24:21 2008 +0000 +++ b/pidgin/win32/nsis/pidgin-installer.nsi Sun Jun 29 14:25:09 2008 +0000 @@ -1388,67 +1388,6 @@ FunctionEnd -; This is a modified StartRadioButtons (from Sections.nsh) -; The only difference is that it allows for nothing in the group to be selected -; In that case, the default variable should be set to "" -!macro StartRadioButtonsUnselectable var - - !define StartRadioButtons_Var "${var}" - - Push $R0 - Push $R1 - - ;If we have no selection, don't try to unselect it - StrCmp "${StartRadioButtons_Var}" "" +4 - SectionGetFlags "${StartRadioButtons_Var}" $R0 - IntOp $R1 $R0 & ${SF_SELECTED} - IntOp $R0 $R0 & ${SECTION_OFF} - SectionSetFlags "${StartRadioButtons_Var}" $R0 - - ; If the previous value isn't currently selected, - ; we don't want to select it at the end - IntCmp $R1 ${SF_SELECTED} +2 - StrCpy "${StartRadioButtons_Var}" "" - - StrCpy $R1 "${StartRadioButtons_Var}" - -!macroend - -Function .onSelChange - Push $0 - Push $1 - Push $2 - - ; Check that at most one of the non-readonly spelling dictionaries are selected - ; We can't use $R0 or $R1 in this block since they're used in the macros - !insertmacro StartRadioButtonsUnselectable $SPELLCHECK_SEL - ; Start with the first language dictionary - IntOp $2 ${SecSpellCheck} + 1 - - start_spellcheck_radio: - SectionGetFlags $2 $0 - - IntOp $1 $0 & ${SF_SECGRPEND} - ; If it is the end of the section group, stop - IntCmp $1 ${SF_SECGRPEND} end_spellcheck_radio - - IntOp $0 $0 & ${SF_RO} - IntCmp $0 ${SF_RO} after_button_insert - ; If !readonly, then it is part of the radiobutton group - !insertmacro RadioButton $2 - after_button_insert: - - IntOp $2 $2 + 1 ;Advance to the next section - Goto start_spellcheck_radio - - end_spellcheck_radio: - !insertmacro EndRadioButtons - - Pop $2 - Pop $1 - Pop $0 -FunctionEnd - ; Page enter and exit functions.. Function preWelcomePage
--- a/po/it.po Sun Jun 29 14:24:21 2008 +0000 +++ b/po/it.po Sun Jun 29 14:25:09 2008 +0000 @@ -3833,8 +3833,8 @@ msgstr "Impossibile trovare un'installazione di ActiveTCL. Se vuoi usare i plugin TCL, installa ActiveTCL da http://www.activestate.com\n" #: ../libpurple/protocols/bonjour/bonjour.c:107 -msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information." -msgstr "Il toolkit Apple Bonjour per Windows non è stato trovato. Leggi le FAQ su: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging per maggiori informazioni." +msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d.pidgin.im/BonjourWindows for more information." +msgstr "Il toolkit Apple Bonjour per Windows non è stato trovato. Leggi le FAQ su: http://d.pidgin.im/BonjourWindows per maggiori informazioni." #: ../libpurple/protocols/bonjour/bonjour.c:126 msgid "Unable to listen for incoming IM connections\n"
--- a/po/nb.po Sun Jun 29 14:24:21 2008 +0000 +++ b/po/nb.po Sun Jun 29 14:25:09 2008 +0000 @@ -3877,7 +3877,7 @@ msgstr "Kunne ikke finne en ActiveTCL installasjon. Om du ønsker å bruke TCL tillegg, installer ActiveTCL fra http://www.activestate.com\n" #: ../libpurple/protocols/bonjour/bonjour.c:101 -msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information." +msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d.pidgin.im/BonjourWindows for more information." msgstr "" #: ../libpurple/protocols/bonjour/bonjour.c:120
--- a/po/te.po Sun Jun 29 14:24:21 2008 +0000 +++ b/po/te.po Sun Jun 29 14:25:09 2008 +0000 @@ -4059,7 +4059,7 @@ msgstr "ActiveTCL ఇన్స్టాలేషన్ ను కనుగొనడంలో అశక్తత. మీరు TCL ప్లగ్ ఇన్లను ఉపయోగించాలనుకుంటే http://www.activestate.com\n" #: ../libpurple/protocols/bonjour/bonjour.c:108 -msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information." +msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d.pidgin.im/BonjourWindows for more information." msgstr "" #: ../libpurple/protocols/bonjour/bonjour.c:127
--- a/po/ur.po Sun Jun 29 14:24:21 2008 +0000 +++ b/po/ur.po Sun Jun 29 14:25:09 2008 +0000 @@ -3891,7 +3891,7 @@ msgstr "ایكٹیو TCL ا نسٹالیشن كی جانچ نا ممكن۔ اگر آپ TCL پلگ انس استعمال كرنا چاہتے ہیں ، ایكٹیوTCL انسٹال كروfrom http://www.activestate.com\n" #: ../libpurple/protocols/bonjour/bonjour.c:108 -msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information." +msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://d.pidgin.im/BonjourWindows for more information." msgstr "" #: ../libpurple/protocols/bonjour/bonjour.c:127
--- a/po/vi.po Sun Jun 29 14:24:21 2008 +0000 +++ b/po/vi.po Sun Jun 29 14:25:09 2008 +0000 @@ -3916,7 +3916,7 @@ "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://" "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-" "LocalMessaging for more information." -msgstr "Không tìm thấy bộ công cụ Apple Bonjour For Windows, xem FAQ (Hỏi Đáp) ở địa chỉ « http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging » để tìm chi tiết." +msgstr "Không tìm thấy bộ công cụ Apple Bonjour For Windows, xem FAQ (Hỏi Đáp) ở địa chỉ « http://d.pidgin.im/BonjourWindows » để tìm chi tiết." #: ../libpurple/protocols/bonjour/bonjour.c:120 msgid "Unable to listen for incoming IM connections\n"