pidgin/android/libpurple

Merge with no conflicts
release-2.x.y
2013-02-13, Mark Doliner
47c90e633067
Parents 89ba88e5d36f9562462b6963
Children 41d15beb309a
Merge with no conflicts
6 files changed, 13 insertions(+), 10 deletions(-)
  • +6 -3
    ChangeLog
  • +2 -2
    libpurple/protocols/jabber/jabber.c
  • +1 -1
    libpurple/protocols/yahoo/libymsg.c
  • +2 -2
    pidgin/gtkdialogs.c
  • +1 -1
    pidgin/plugins/timestamp_format.c
  • +1 -1
    pidgin/win32/nsis/generate_gtk_zip.sh
    • --- a/ChangeLog Wed Feb 13 06:59:16 2013 -0800
    +++ b/ChangeLog Wed Feb 13 06:59:45 2013 -0800
    @@ -75,11 +75,14 @@
    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
    --- a/libpurple/protocols/jabber/jabber.c Wed Feb 13 06:59:16 2013 -0800
    +++ b/libpurple/protocols/jabber/jabber.c Wed Feb 13 06:59:45 2013 -0800
    @@ -666,7 +666,7 @@
    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 @@
    } 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));
    --- a/libpurple/protocols/yahoo/libymsg.c Wed Feb 13 06:59:16 2013 -0800
    +++ b/libpurple/protocols/yahoo/libymsg.c Wed Feb 13 06:59:45 2013 -0800
    @@ -2267,7 +2267,7 @@
    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:
    --- a/pidgin/gtkdialogs.c Wed Feb 13 06:59:16 2013 -0800
    +++ b/pidgin/gtkdialogs.c Wed Feb 13 06:59:45 2013 -0800
    @@ -515,14 +515,14 @@
    "\tXMPP MUC: devel@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@pidgin.im\">support@pidgin.im</a><br/>"
    --- a/pidgin/plugins/timestamp_format.c Wed Feb 13 06:59:16 2013 -0800
    +++ b/pidgin/plugins/timestamp_format.c Wed Feb 13 06:59:45 2013 -0800
    @@ -35,7 +35,7 @@
    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);
    --- a/pidgin/win32/nsis/generate_gtk_zip.sh Wed Feb 13 06:59:16 2013 -0800
    +++ b/pidgin/win32/nsis/generate_gtk_zip.sh Wed Feb 13 06:59:45 2013 -0800
    @@ -17,7 +17,7 @@
    #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)