/pidgin/main: 2e77c7b22d41: Merge with release-2.x.y.

[Elliott Sales de Andrade]

Changeset: 2e77c7b22d41d6aa0bf09dc971193fbebad9dce4
Author:	 Elliott Sales de Andrade <quantum.analyst at gmail.com>
Date:	 2012-07-22 19:57 -0400
Branch:	 default
URL: http://hg.pidgin.im/pidgin/main/rev/2e77c7b22d41

Description:

Merge with release-2.x.y.

diffstat:

 ChangeLog                                 |   8 ++++++++
 doc/pidgin.1.in                           |   4 +---
 libpurple/protocols/yahoo/yahoo_picture.c |   3 ---
 libpurple/protocols/yahoo/yahoo_profile.c |   4 ----
 po/de.po                                  |  14 ++++++++++++--
 5 files changed, 21 insertions(+), 12 deletions(-)

diffs (97 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -47,6 +47,14 @@
 	* The Offline Message Emulation plugin now adds a note that the message
 	  was an offline message. (Flavius Anton) (#2497)
 
+	MSN:
+	* Fix a crash when removing a user before its icon is loaded. (Mark
+	  Barfield) (#15217)
+
+	Yahoo!:
+	* Fix a double-free in profile/picture loading code. (Mihai Serban)
+	  (#15053)
+
 version 2.10.6 (07/06/2012):
 	Pidgin:
 	* Fix a bug that requires a triple-click to open a conversation
diff --git a/doc/pidgin.1.in b/doc/pidgin.1.in
--- a/doc/pidgin.1.in
+++ b/doc/pidgin.1.in
@@ -218,9 +218,7 @@
 .TP
 .B Notify buddies that you are typing to them
 Some protocols allow clients to tell their buddies when they are typing.
-This option enables this feature for protocols that supports it.  For XMPP,
-this also enables sending the "User has left the conversation" message
-when ending the conversation.
+This option enables this feature for protocols that supports it.
 
 .TP
 .B Default Formatting
diff --git a/libpurple/protocols/yahoo/yahoo_picture.c b/libpurple/protocols/yahoo/yahoo_picture.c
--- a/libpurple/protocols/yahoo/yahoo_picture.c
+++ b/libpurple/protocols/yahoo/yahoo_picture.c
@@ -137,9 +137,6 @@
 		if (url_data != NULL) {
 			yd = purple_connection_get_protocol_data(gc);
 			yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
-		} else {
-			g_free(data->who);
-			g_free(data);
 		}
 	} else if (who && send_icon_info) {
 		yahoo_send_picture_info(gc, who);
diff --git a/libpurple/protocols/yahoo/yahoo_profile.c b/libpurple/protocols/yahoo/yahoo_profile.c
--- a/libpurple/protocols/yahoo/yahoo_profile.c
+++ b/libpurple/protocols/yahoo/yahoo_profile.c
@@ -1278,10 +1278,6 @@
 	url_data = purple_util_fetch_url(url, TRUE, NULL, FALSE, -1, yahoo_got_info, data);
 	if (url_data != NULL)
 		yd->url_datas = g_slist_prepend(yd->url_datas, url_data);
-	else {
-		g_free(data->name);
-		g_free(data);
-	}
 
 	g_free(url);
 }
diff --git a/po/de.po b/po/de.po
--- a/po/de.po
+++ b/po/de.po
@@ -11,8 +11,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-11 19:37+0200\n"
-"PO-Revision-Date: 2012-06-11 19:36+0200\n"
+"POT-Creation-Date: 2012-07-12 17:36+0200\n"
+"PO-Revision-Date: 2012-07-12 17:36+0200\n"
 "Last-Translator: Jochen Kemnade <jochenkemnade at web.de>\n"
 "Language-Team: German <de at li.org>\n"
 "Language: de\n"
@@ -11574,6 +11574,13 @@
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
+msgid ""
+"The account has disconnected and you are no longer in this chat. You will "
+"automatically rejoin the chat when the account reconnects."
+msgstr ""
+"Das Konto wurde getrennt und Sie sind nicht mehr in diesem Chat. Sie werden "
+"den Chat automatisch wieder betreten, wenn das Konto wieder verbunden ist."
+
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Leert alle Gesprächsfenster."
 
@@ -11865,6 +11872,9 @@
 msgid "Malay"
 msgstr "Malaiisch"
 
+msgid "Burmese"
+msgstr "Birmanisch"
+
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norwegisch"