/pidgin/main: cd284b4ca152: Merge with release-2.x.y.
Elliott Sales de Andrade
qulogic at pidgin.im
Sun Jul 8 18:28:11 EDT 2012
Changeset: cd284b4ca15265f3eecae31805f51779f04c1633
Author: Elliott Sales de Andrade <qulogic at pidgin.im>
Date: 2012-07-08 18:27 -0400
Branch: default
URL: http://hg.pidgin.im/pidgin/main/rev/cd284b4ca152
Description:
Merge with release-2.x.y.
diffstat:
.hgtags | 2 +
.tx/config | 3 +-
ChangeLog | 16 +-
ChangeLog.API | 3 +
Makefile.am | 23 +-
libpurple/protocols/msn/oim.c | 2 +-
libpurple/protocols/mxit/markup.c | 7 +-
pidgin/gtkblist.c | 4 -
pidgin/gtkconv.c | 2 +-
pidgin/gtkdialogs.c | 33 +-
po/ChangeLog | 9 +-
po/my_MM.po | 16571 +++++++++++++----------------------
po/nn.po | 545 +-
13 files changed, 6405 insertions(+), 10815 deletions(-)
diffs (truncated from 26000 to 300 lines):
diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -84,3 +84,5 @@
fbe2ce8d288fe7e2ab4bf180a537664ef7f8e907 v2.10.2
dab0253fe3754ffd68e070cdfbbf31cd79f9a421 v2.10.3
1d00b9e4aa6add6dca97cca4ac614d63bd105dfd v2.10.4
+a3d157700972b48cf0a23b300261a5ab0c6e165b v2.10.5
+4992bd90d8ad78ebdd324dd90d3e9d443f7dd002 v2.10.6
diff --git a/.tx/config b/.tx/config
--- a/.tx/config
+++ b/.tx/config
@@ -1,8 +1,7 @@
[main]
-host = https://www.transifex.net
+host = https://www.transifex.com
[pidgin.pidgin]
file_filter = po/<lang>.po
source_file = po/pidgin.pot
source_lang = en
-
diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,7 +47,12 @@
* The Offline Message Emulation plugin now adds a note that the message
was an offline message. (Flavius Anton) (#2497)
-version 2.10.5:
+version 2.10.6 (07/06/2012):
+ Pidgin:
+ * Fix a bug that requires a triple-click to open a conversation
+ window from the buddy list. (#15199)
+
+version 2.10.5 (07/05/2012):
libpurple:
* Add support for GNOME3 proxy settings. (Mihai Serban) (#15054)
@@ -55,6 +60,15 @@
* Fix a crash that may occur when trying to ignore a user who is
not in the current chat room. (#15139)
+ MSN:
+ * Fix building with MSVC on Windows (broken in 2.10.4). (Florian
+ Quèze)
+
+ MXit:
+ * Fix a buffer overflow vulnerability when parsing incoming messages
+ containing inline images. Thanks to Ulf Härnhammar for reporting
+ this! (CVE-2012-3374)
+
version 2.10.4 (05/06/2012):
General:
* Support building against Farstream in addition to Farsight.
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -247,6 +247,9 @@
* xmlnode_set_attrib_with_namespace
* xmlnode_set_attrib_with_prefix
+version 2.10.6:
+ * No changes
+
version 2.10.5:
* No changes
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,35 +32,36 @@
commit-check:
(cd po ; intltool-update -m 2>&1 | grep -v '^mismatched quotes.*\.py$$' | sed "s|current directory|po directory|" | grep . ; if [ $$? = 0 ] ; then exit 1 ; else exit 0 ; fi)
+
+# Ensure these files are sorted and contain no duplicates:
LC_ALL=C sort -c -t/ -u po/POTFILES.in
LC_ALL=C sort -c -t/ -u po/POTFILES.skip
+
+# Ensure COPYRIGHT is 100% UTF-8
iconv -f utf8 -t utf8 COPYRIGHT | cmp COPYRIGHT -
-version-check: commit-check
-# We don't want to release development versions.
+version-check:
+# Ensure our version string does not contain "dev"
test x`echo $(PACKAGE_VERSION) | grep dev` = x
-# When doing a new minor (or major) release (X.Y.0), there must be a section in
-# ChangeLog.API.
- echo $(PACKAGE_VERSION) | grep -v "^[0-9]\+\.[0-9]\+\.0$$" >/dev/null || head ChangeLog.API | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
-
-# For all releases, check the ChangeLogs.
- head ChangeLog | grep "^version $(PACKAGE_VERSION) (`date +%m/%d/%Y`):$$" >/dev/null
- head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
+# Ensure ChangeLogs have the correct version
+ head ChangeLog | grep "^version $(PACKAGE_VERSION) (.*):$$" >/dev/null
+ head ChangeLog.API | grep "^version $(PACKAGE_VERSION):$$" >/dev/null
+ head po/ChangeLog | grep "^version $(PACKAGE_VERSION)$$" >/dev/null
# Ensure we're working from a tag...
test x`hg log -r "tag($(PACKAGE_VERSION))" --template "{node}"` = x`hg id -i --debug`
# ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+")
test "x`hg st -mard`" = x
-release: version-check distcheck packages
-
packages:
gpg -ab pidgin-$(PACKAGE_VERSION).tar.gz
gpg -ab pidgin-$(PACKAGE_VERSION).tar.bz2
gpg --verify pidgin-$(PACKAGE_VERSION).tar.gz.asc pidgin-$(PACKAGE_VERSION).tar.gz
gpg --verify pidgin-$(PACKAGE_VERSION).tar.bz2.asc pidgin-$(PACKAGE_VERSION).tar.bz2
+release: commit-check version-check distcheck packages
+
if INSTALL_I18N
PO_DIR=po
DESKTOP_FILE=pidgin.desktop
diff --git a/libpurple/protocols/msn/oim.c b/libpurple/protocols/msn/oim.c
--- a/libpurple/protocols/msn/oim.c
+++ b/libpurple/protocols/msn/oim.c
@@ -660,7 +660,7 @@
charset = msn_message_get_charset(message);
}
- if (charset && !((strncasecmp(charset, "UTF-8", 5) == 0) || (strncasecmp(charset, "UTF8", 4) == 0))) {
+ if (charset && !((g_ascii_strncasecmp(charset, "UTF-8", 5) == 0) || (g_ascii_strncasecmp(charset, "UTF8", 4) == 0))) {
clean_msg = g_convert(decode_msg, body_len, "UTF-8", charset, NULL, NULL, NULL);
if (!clean_msg) {
diff --git a/libpurple/protocols/mxit/markup.c b/libpurple/protocols/mxit/markup.c
--- a/libpurple/protocols/mxit/markup.c
+++ b/libpurple/protocols/mxit/markup.c
@@ -371,7 +371,7 @@
int start;
unsigned int end;
int emo_ofs;
- char ii[128];
+ char* ii;
char tag[64];
int* img_id;
@@ -389,8 +389,7 @@
if ( end == mx->msg->len ) /* end of emoticon tag not found */
break;
- memset( ii, 0x00, sizeof( ii ) );
- memcpy( ii, &mx->msg->str[emo_ofs], end - emo_ofs );
+ ii = g_strndup(&mx->msg->str[emo_ofs], end - emo_ofs);
/* remove inline image tag */
g_string_erase( mx->msg, start, ( end - start ) + 1 );
@@ -408,6 +407,8 @@
*img_id );
g_string_insert( mx->msg, start, tag );
}
+
+ g_free(ii);
}
}
diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c
--- a/pidgin/gtkblist.c
+++ b/pidgin/gtkblist.c
@@ -1978,10 +1978,6 @@
pidgin_retrieve_user_info(purple_account_get_connection(purple_buddy_get_account(b)), purple_buddy_get_name(b));
handled = TRUE;
}
- else if ((event->button == 1) && (event->type == GDK_2BUTTON_PRESS) &&
- ((PURPLE_BLIST_NODE_IS_CONTACT(node)) || (PURPLE_BLIST_NODE_IS_BUDDY(node)))) {
- handled = TRUE;
- }
#if (1)
/*
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -8120,7 +8120,7 @@
purple_conversation_get_account(conv) == account) {
purple_conversation_set_data(conv, "want-to-rejoin", GINT_TO_POINTER(TRUE));
purple_conversation_write(conv, NULL, _("The account has disconnected and you are no "
- "longer in this chat. You will be automatically rejoined in the chat when "
+ "longer in this chat. You will automatically rejoin the chat when "
"the account reconnects."),
PURPLE_MESSAGE_SYSTEM, time(NULL));
}
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -153,8 +153,8 @@
{N_("Belarusian Latin"), "be at latin", "Ihar Hrachyshka", "ihar.hrachyshka at gmail.com"},
{N_("Bulgarian"), "bg", "Vladimira Girginova", "missing at here.is"},
{NULL, NULL, "Vladimir (Kaladan) Petkov", "kaladan at gmail.com"},
- {N_("Bengali"), "bn", "Israt Jahan", "israt at ankur.org.bd"},
- {NULL, NULL, "Jamil Ahmed", "jamil at bengalinux.org"},
+ {N_("Bengali"), "bn", "Jamil Ahmed", "jamil at bengalinux.org"},
+ {NULL, NULL, "Israt Jahan", "israt at ankur.org.bd"},
{NULL, NULL, "Samia Nimatullah", "mailsamia2001 at yahoo.com"},
{N_("Bengali-India"), "bn_IN", "Runa Bhattacharjee", "runab at fedoraproject.org"},
{N_("Bosnian"), "bs", "Lejla Hadzialic", "lejlah at gmail.com"},
@@ -162,8 +162,8 @@
{N_("Valencian-Catalan"), "ca at valencia", "Toni Hermoso", "toniher at softcatala.org"},
{NULL, NULL, "Josep Puigdemont", "tradgnome at softcatala.org"},
{N_("Czech"), "cs", "David Vachulka", "david at konstrukce-cad.com"},
- {N_("Danish"), "da", "Morten Brix Pedersen", "morten at wtf.dk"},
- {NULL, NULL, "Peter Bach", "bach.peter at gmail.com"},
+ {N_("Danish"), "da", "Peter Bach", "bach.peter at gmail.com"},
+ {NULL, NULL, "Morten Brix Pedersen", "morten at wtf.dk"},
{N_("German"), "de", "Björn Voigt", "bjoern at cs.tu-berlin.de"},
{NULL, NULL, "Jochen Kemnade", "jochenkemnade at web.de"},
{N_("Dzongkha"), "dz", "Norbu", "nor_den at hotmail.com"},
@@ -179,8 +179,8 @@
{N_("Estonian"), "et", "Ivar Smolin", "okul at linux.ee"},
{N_("Basque"), "eu", "Mikel Pascual Aldabaldetreku", "mikel.paskual at gmail.com"},
{N_("Persian"), "fa", "Elnaz Sarbar", "elnaz at farsiweb.info"},
+ {NULL, NULL, "Roozbeh Pournader", "roozbeh at farsiweb.info"},
{NULL, NULL, "Meelad Zakaria", "meelad at farsiweb.info"},
- {NULL, NULL, "Roozbeh Pournader ", "roozbeh at farsiweb.info"},
{N_("Finnish"), "fi", "Timo Jyrinki", "timo.jyrinki at iki.fi"},
{N_("French"), "fr", "Éric Boumaour", "zongo_fr at users.sourceforge.net"},
{N_("Irish"), "ga", "Aaron Kearns", "ajkearns6 at gmail.com"},
@@ -201,8 +201,8 @@
{N_("Khmer"), "km", "Khoem Sokhem", "khoemsokhem at khmeros.info"},
{N_("Kannada"), "kn", N_("Kannada Translation team"), "translation at sampada.info"},
{N_("Korean"), "ko", "Sushizang", "sushizang at empal.com"},
- {N_("Kurdish"), "ku", "Erdal Ronahi", "erdal.ronahi at gmail.com"},
- {NULL, NULL, "Amed Ç. Jiyan", "amedcj at hotmail.com"},
+ {N_("Kurdish"), "ku", "Amed Ç. Jiyan", "amedcj at hotmail.com"},
+ {NULL, NULL, "Erdal Ronahi", "erdal.ronahi at gmail.com"},
{NULL, NULL, "Rizoyê Xerzî", "rizoxerzi at hotmail.com"},
{N_("Lao"), "lo", "Anousak Souphavah", "anousak at gmail.com"},
{N_("Maithili"), "mai", "Sangeeta Kumari", "sangeeta_0975 at yahoo.com"},
@@ -215,6 +215,7 @@
{N_("Mongolian"), "mn", "gooyo", NULL},
{N_("Marathi"), "mr", "Sandeep Shedmake", "sandeep.shedmake at gmail.com"},
{N_("Malay"), "ms_MY", "Muhammad Najmi bin Ahmad Zabidi", "najmi.zabidi at gmail.com"},
+ {N_("Burmese"), "my_MM", "Thura Hlaing", "trhura at gmail.com"},
{N_("Bokmål Norwegian"), "nb", "Hans Fredrik Nordhaug", "hans at nordhaug.priv.no"},
{N_("Nepali"), "ne", "Shyam Krishna Bal", "shyamkrishna_bal at yahoo.com"},
{N_("Dutch, Flemish"), "nl", "Gideon van Melle", "translations at gvmelle.com"},
@@ -235,8 +236,8 @@
{N_("Albanian"), "sq", "Besnik Bleta", "besnik at programeshqip.org"},
{N_("Serbian"), "sr", "Miloš Popović", "gpopac at gmail.com"},
{N_("Serbian Latin"), "sr at latin", "Miloš Popović", "gpopac at gmail.com"},
- {N_("Sinhala"), "si", "Danishka Navin", "snavin at redhat.com"},
- {NULL, NULL, "Yajith Ajantha Dayarathna", "yajith at gmail.com"},
+ {N_("Sinhala"), "si", "Yajith Ajantha Dayarathna", "yajith at gmail.com"},
+ {NULL, NULL, "Danishka Navin", "snavin at redhat.com"},
{N_("Swedish"), "sv", "Peter Hjalmarsson", "xake at telia.com"},
{N_("Swahili"), "sw", "Paul Msegeya", "msegeya at gmail.com"},
{N_("Tamil"), "ta", "I. Felix", "ifelix25 at gmail.com"},
@@ -261,7 +262,7 @@
{N_("Amharic"), "am", "Daniel Yacob", NULL},
{N_("Arabic"), "ar", "Mohamed Magdy", "alnokta at yahoo.com"},
{N_("Bulgarian"), "bg", "Hristo Todorov", NULL},
- {N_("Bengali"), "bn", "INDRANIL DAS GUPTA", "indradg at l2c2.org"},
+ {N_("Bengali"), "bn", "Indranil Das Gupta", "indradg at l2c2.org"},
{NULL, NULL, "Tisa Nafisa", "tisa_nafisa at yahoo.com"},
{N_("Catalan"), "ca", "JM Pérez Cáncer", NULL},
{NULL, NULL, "Robert Millan", NULL},
@@ -279,9 +280,9 @@
{N_("Finnish"), "fi", "Arto Alakulju", NULL},
{NULL, NULL, "Tero Kuusela", NULL},
{N_("French"), "fr", "Sébastien François", NULL},
+ {NULL, NULL, "Loïc Jeannin", NULL},
{NULL, NULL, "Stéphane Pontier", NULL},
{NULL, NULL, "Stéphane Wirtel", NULL},
- {NULL, NULL, "Loïc Jeannin", NULL},
{N_("Galician"), "gl", "Ignacio Casal Quinteiro", NULL},
{N_("Hebrew"), "he", "Pavel Bibergal", NULL},
{N_("Hindi"), "hi", "Ravishankar Shrivastava", NULL},
@@ -289,8 +290,8 @@
{N_("Italian"), "it", "Salvatore di Maggio", NULL},
{N_("Japanese"), "ja", "Takashi Aihana", NULL},
{NULL, NULL, "Ryosuke Kutsuna", NULL},
+ {NULL, NULL, "Junichi Uekawa", NULL},
{NULL, NULL, "Taku Yasui", NULL},
- {NULL, NULL, "Junichi Uekawa", NULL},
{N_("Georgian"), "ka", "Temuri Doghonadze", NULL},
{N_("Korean"), "ko", "Sang-hyun S", NULL},
{NULL, NULL, "A Ho-seok Lee", NULL},
@@ -303,25 +304,25 @@
{NULL, NULL, "Petter Johan Olsen", NULL},
{NULL, NULL, "Espen Stefansen", "espenas at gmail.com"},
{N_("Dutch, Flemish"), "nl", "Vincent van Adrighem", "V.vanAdrighem at dirck.mine.nu"},
- {N_("Polish"), "pl", "Emil Nowak", "emil5 at go2.pl"},
+ {N_("Polish"), "pl", "Krzysztof Foltman", "krzysztof at foltman.com"},
{NULL, NULL, "Paweł Godlewski", "pawel at bajk.pl"},
- {NULL, NULL, "Krzysztof Foltman", "krzysztof at foltman.com"},
{NULL, NULL, "Piotr Makowski", NULL},
+ {NULL, NULL, "Emil Nowak", "emil5 at go2.pl"},
{NULL, NULL, "Przemysław Sułek", NULL},
{N_("Portuguese-Brazil"), "pt_BR", "MaurÃcio de Lemos Rodrigues Collares Neto", "mauricioc at gmail.com"},
{N_("Russian"), "ru", "Dmitry Beloglazov", "dmaa at users.sf.net"},
{NULL, NULL, "Alexandre Prokoudine", NULL},
{NULL, NULL, "Sergey Volozhanin", NULL},
{N_("Slovak"), "sk", "Daniel Režný", NULL},
+ {NULL, NULL, "Richard Golier", NULL},
More information about the Commits
mailing list