/soc/2012/michael/android: b58c69e6c0d7: %erged in changes from ...
Michael Zangl
michael at soc.pidgin.im
Wed Jul 18 07:06:49 EDT 2012
Changeset: b58c69e6c0d7fd37bccee15b42033ce1ad62b599
Author: Michael Zangl <michael at soc.pidgin.im>
Date: 2012-07-18 13:05 +0200
Branch: soc.2012.android
URL: http://hg.pidgin.im/soc/2012/michael/android/rev/b58c69e6c0d7
Description:
%erged in changes from default
diffstat:
.hgignore | 80 +-
.hgtags | 2 +
.tx/config | 3 +-
ChangeLog | 16 +-
ChangeLog.API | 3 +
Makefile.am | 23 +-
libpurple/blist.c | 21 +-
libpurple/protocols/msn/oim.c | 2 +-
libpurple/protocols/mxit/markup.c | 7 +-
libpurple/prpl.h | 17 +-
libpurple/util.c | 28 +-
libpurple/util.h | 11 +
pidgin/gtkaccount.c | 80 +-
pidgin/gtkblist.c | 30 +-
pidgin/gtkconv.c | 36 +-
pidgin/gtkconvwin.h | 18 +-
pidgin/gtkdialogs.c | 37 +-
pidgin/gtkrequest.c | 7 +
pidgin/gtkwebview.c | 17 +
pidgin/gtkwebview.h | 11 +
pidgin/plugins/xmppconsole.c | 17 +-
po/ChangeLog | 9 +-
po/my_MM.po | 16571 +++++++++++++----------------------
po/nn.po | 545 +-
24 files changed, 6662 insertions(+), 10929 deletions(-)
diffs (truncated from 26784 to 300 lines):
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -28,64 +28,64 @@
.*\.so$
Doxyfile(\.mingw)?$
VERSION$
-aclocal.m4
-autogen.args
+aclocal\.m4
+autogen\.args
autom4te.*\.cache
compile
-config.cache
-config.guess
-config.h$
-config.h.in
-config.log
-config.status
-config.sub
+config\.cache
+config\.guess
+config\.h$
+config\.h\.in
+config\.log
+config\.status
+config\.sub
configure$
depcomp
doc/finch.1$
doc/html
doc/pidgin.1$
finch/finch$
-finch/libgnt/gntmarshal.c
-finch/libgnt/gntmarshal.h
+finch/libgnt/gntmarshal\.c
+finch/libgnt/gntmarshal\.h
install-sh
intltool-.*
-libpurple/dbus-bindings.c
-libpurple/dbus-signals.c
-libpurple/dbus-types.c
-libpurple/dbus-types.h
+libpurple/dbus-bindings\.c
+libpurple/dbus-signals\.c
+libpurple/dbus-types\.c
+libpurple/dbus-types\.h
libpurple/example/nullclient
libpurple/gconf/purple.schemas$
-libpurple/marshallers.[ch]
-libpurple/plugins/dbus-example-bindings.c
-libpurple/plugins/perl/common/Makefile.PL$
-libpurple/plugins/perl/common/Makefile.old
-libpurple/plugins/perl/common/const-c.inc
-libpurple/plugins/perl/common/const-xs.inc
+libpurple/marshallers\.[ch]
+libpurple/plugins/dbus-example-bindings\.c
+libpurple/plugins/perl/common/Makefile\.PL$
+libpurple/plugins/perl/common/Makefile\.old
+libpurple/plugins/perl/common/const-c\.inc
+libpurple/plugins/perl/common/const-xs\.inc
libpurple/plugins/perl/common/lib
-libpurple/purple-client-bindings.c
-libpurple/purple-client-bindings.h
+libpurple/purple-client-bindings\.c
+libpurple/purple-client-bindings\.h
libpurple/purple-client-example
-libpurple/purple.h$
+libpurple/purple\.h$
libpurple/tests/check_libpurple
libpurple/tests/libpurple..
-libpurple/version.h$
-libpurple/win32/libpurplerc.rc$
+libpurple/version\.h$
+libpurple/win32/libpurplerc\.rc$
libtool
-local.mak
-ltmain.sh
+local\.mak
+ltmain\.sh
missing
mkinstalldirs
-package_revision.h
-package_revision_raw.txt
-pidgin-*.*.*-dbgsym$
-pidgin-*.*.*-dbgsym.zip$
-pidgin-*.*.*-win32-bin.zip$
-pidgin-*.*.*-win32bin$
-pidgin-.*.tar.bz2
-pidgin-.*.tar.gz
-pidgin.apspec$
-pidgin.desktop$
-pidgin.spec$
+package_revision\.h
+package_revision_raw\.txt
+pidgin-.*\..*\..*-dbgsym$
+pidgin-.*\..*\..*-dbgsym\.zip$
+pidgin-.*\..*\..*-win32-bin\.zip$
+pidgin-.*\..*\..*-win32bin$
+pidgin-\..*\.tar\.bz2
+pidgin-\..*\.tar\.gz
+pidgin\.apspec$
+pidgin\.desktop$
+pidgin\.spec$
pidgin/pidgin$
pidgin/pixmaps/emotes/default/24/theme
pidgin/pixmaps/emotes/none/theme
@@ -103,7 +103,7 @@
pidgin/win32/nsis/translations
pidgin/win32/pidgin_dll_rc.rc$
pidgin/win32/pidgin_exe_rc.rc$
-po/Makefile.in.in
+po/Makefile\.in\.in
po/POTFILES$
po/missing
po/notexist
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/blist.c b/libpurple/blist.c
--- a/libpurple/blist.c
+++ b/libpurple/blist.c
@@ -767,7 +767,9 @@
PurpleBlistNode *
purple_blist_get_root()
{
- return purplebuddylist ? purplebuddylist->root : NULL;
+ g_return_val_if_fail(purplebuddylist != NULL, NULL);
+
+ return purplebuddylist->root;
}
static void
@@ -1486,7 +1488,7 @@
/* Add group to blist if isn't already on it. Fixes #2752. */
if (!purple_find_group(group->name)) {
purple_blist_add_group(group,
- purple_blist_get_last_sibling(purplebuddylist->root));
+ purple_blist_get_last_sibling(purple_blist_get_root()));
}
} else {
group = (PurpleGroup*)node->parent;
@@ -1589,7 +1591,7 @@
/* Add group to blist if isn't already on it. Fixes #2752. */
if (!purple_find_group(g->name)) {
purple_blist_add_group(g,
- purple_blist_get_last_sibling(purplebuddylist->root));
+ purple_blist_get_last_sibling(purple_blist_get_root()));
}
c = purple_contact_new();
purple_blist_add_contact(c, g,
@@ -1839,7 +1841,7 @@
if (g == NULL) {
g = purple_group_new(_("Buddies"));
purple_blist_add_group(g,
- purple_blist_get_last_sibling(purplebuddylist->root));
+ purple_blist_get_last_sibling(purple_blist_get_root()));
}
}
@@ -2068,11 +2070,13 @@
{
PurpleBlistUiOps *ops = purple_blist_get_ui_ops();
PurpleBlistNode *node, *gnode;
+ PurpleGroup *group;
g_return_if_fail(contact != NULL);
node = (PurpleBlistNode *)contact;
gnode = node->parent;
+ group = PURPLE_GROUP(gnode);
if (node->child) {
/*
@@ -2097,6 +2101,7 @@
node->prev->next = node->next;
if (node->next)
node->next->prev = node->prev;
+ group->totalsize--;
/* Update the UI */
if (ops && ops->remove)
@@ -2462,7 +2467,7 @@
hb.name = (gchar *)purple_normalize(account, name);
More information about the Commits
mailing list