/pidgin/main: 47c90e633067: Merge with no conflicts

[Mark Doliner]

Changeset: 47c90e63306722256fda1c974a3ddfbe1e0a8385
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2013-02-13 06:59 -0800
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/47c90e633067

Description:

Merge with no conflicts

diffstat:

 ChangeLog                             |  9 ++++++---
 libpurple/protocols/jabber/jabber.c   |  4 ++--
 libpurple/protocols/yahoo/libymsg.c   |  2 +-
 pidgin/gtkdialogs.c                   |  4 ++--
 pidgin/plugins/timestamp_format.c     |  2 +-
 pidgin/win32/nsis/generate_gtk_zip.sh |  2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diffs (98 lines):

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -75,11 +75,14 @@ version 2.10.7 (02/13/2013):
 	  such as MacPorts' +no_x11 variant.
 
 	Windows-Specific Changes:
-	* Compile with secure flags (#15290)
+	* Compile with secure flags (Jurre van Bergen) (#15290)
 	* Installer downloads GTK+ Runtime and Debug Symbols more securely.
-	  (#15277)
+	  Thanks goes to Jacob Appelbaum of the Tor Project for identifying
+	  this issue and suggesting solutions. (#15277)
 	* Updates to a number of dependencies, some of which have security
-	  related fixes. (#14571, #15285, #15286)
+	  related fixes. Thanks again to Jacob Appelbaum and Jurre van Bergen
+	  for identifying the vulnerable libraries and to Dieter Verfaillie 
+	  for helping getting the libraries updated. (#14571, #15285, #15286)
 		* ATK 1.32.0-2
 		* Cyrus SASL 2.1.25
 		* expat 2.1.0-1
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -666,7 +666,7 @@ jabber_recv_cb_ssl(gpointer data, Purple
 	else {
 		gchar *tmp;
 		if (len == 0)
-			tmp = g_strdup_printf(_("Server closed the connection"));
+			tmp = g_strdup(_("Server closed the connection"));
 		else
 			tmp = g_strdup_printf(_("Lost connection with server: %s"),
 					g_strerror(errno));
@@ -724,7 +724,7 @@ jabber_recv_cb(gpointer data, gint sourc
 	} else {
 		gchar *tmp;
 		if (len == 0)
-			tmp = g_strdup_printf(_("Server closed the connection"));
+			tmp = g_strdup(_("Server closed the connection"));
 		else
 			tmp = g_strdup_printf(_("Lost connection with server: %s"),
 					g_strerror(errno));
diff --git a/libpurple/protocols/yahoo/libymsg.c b/libpurple/protocols/yahoo/libymsg.c
--- a/libpurple/protocols/yahoo/libymsg.c
+++ b/libpurple/protocols/yahoo/libymsg.c
@@ -2267,7 +2267,7 @@ static void yahoo_process_authresp(Purpl
 	case 52:
 		/* See #9660. As much as we know, reconnecting shouldn't hurt */
 		purple_debug_info("yahoo", "Got error 52, Set to autoreconnect\n");
-		msg = g_strdup_printf(_("Unknown error 52.  Reconnecting should fix this."));
+		msg = g_strdup(_("Unknown error 52.  Reconnecting should fix this."));
 		reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR;
 		break;
 	case 1013:
diff --git a/pidgin/gtkdialogs.c b/pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c
+++ b/pidgin/gtkdialogs.c
@@ -515,14 +515,14 @@ void pidgin_dialogs_about(void)
 			  "\tXMPP MUC: devel at conference.pidgin.im<BR><BR>"), PURPLE_WEBSITE,
 			"http://developer.pidgin.im/wiki/FAQ");
 
-	g_string_append_printf(str,
+	g_string_append(str,
 			"<font size=\"4\"><b>Help for Oracle Employees</b></font> is "
 			"available from your normal internal helpdesk or IT department.  "
 			"The Pidgin developer and user communities cannot assist you in "
 			"the configuration or use of Pidgin within Oracle, as we know "
 			"nothing of Oracle's infrastructure.<br/><br/>");
 
-	g_string_append_printf(str,
+	g_string_append(str,
 			_("<font size=\"4\"><b>Help from other Pidgin users</b></font> is "
 			  "available by e-mailing <a "
 			  "href=\"mailto:support at pidgin.im\">support at pidgin.im</a><br/>"
diff --git a/pidgin/plugins/timestamp_format.c b/pidgin/plugins/timestamp_format.c
--- a/pidgin/plugins/timestamp_format.c
+++ b/pidgin/plugins/timestamp_format.c
@@ -35,7 +35,7 @@ get_plugin_pref_frame(PurplePlugin *plug
 	ppref = purple_plugin_pref_new_with_label(_("Timestamp Format Options"));
 	purple_plugin_pref_frame_add(frame, ppref);
 
-	tmp = g_strdup_printf(_("_Force timestamp format:"));
+	tmp = g_strdup(_("_Force timestamp format:"));
 	ppref = purple_plugin_pref_new_with_name_and_label(
 			"/plugins/gtk/timestamp_format/force",
 			tmp);
diff --git a/pidgin/win32/nsis/generate_gtk_zip.sh b/pidgin/win32/nsis/generate_gtk_zip.sh
--- a/pidgin/win32/nsis/generate_gtk_zip.sh
+++ b/pidgin/win32/nsis/generate_gtk_zip.sh
@@ -17,7 +17,7 @@ PIDGIN_VERSION=$( < $PIDGIN_BASE/VERSION
 
 #This needs to be changed every time there is any sort of change.
 BUNDLE_VERSION=2.16.6.1
-BUNDLE_SHA1SUM=5e16b7efb11943e8c80bc390f6c38df904fd36ed
+BUNDLE_SHA1SUM=3e586e3f716f909ff6c11bf64c5ad23f1a0c98bf
 ZIP_FILE="$PIDGIN_BASE/pidgin/win32/nsis/gtk-runtime-$BUNDLE_VERSION.zip"
 
 #Download the existing file (so that we distribute the exact same file for all releases with the same bundle version)