pidgin/pidgin

Merged default branch
soc.2013.gobjectification.plugins
2014-06-27, Ankit Vani
1aee6d5eefba
Parents ff7a5660dd4f0b3bca55747d
Children 5902dd574c6e
Merged default branch
33 files changed, 73 insertions(+), 255 deletions(-)
  • +1 -1
    ChangeLog
  • +1 -1
    Makefile.am
  • +3 -2
    finch/gntconv.c
  • +1 -1
    finch/plugins/lastlog.c
  • +8 -5
    libpurple/conversation.c
  • +1 -1
    libpurple/keyring.c
  • +2 -2
    libpurple/media/backend-fs2.c
  • +5 -0
    libpurple/plugins/keyrings/secretservice.c
  • +0 -2
    libpurple/protocols/gg/Makefile.am
  • +0 -1
    libpurple/protocols/gg/Makefile.mingw
  • +4 -10
    libpurple/protocols/gg/account.c
  • +4 -12
    libpurple/protocols/gg/chat.c
  • +0 -2
    libpurple/protocols/gg/chat.h
  • +0 -67
    libpurple/protocols/gg/deprecated.c
  • +0 -37
    libpurple/protocols/gg/deprecated.h
  • +2 -37
    libpurple/protocols/gg/gg.c
  • +0 -6
    libpurple/protocols/gg/gg.h
  • +0 -2
    libpurple/protocols/gg/libgadu-events.c
  • +0 -2
    libpurple/protocols/gg/libgadu-events.h
  • +2 -8
    libpurple/protocols/gg/libgaduw.c
  • +4 -23
    libpurple/protocols/gg/message-prpl.c
  • +6 -0
    libpurple/protocols/gg/pubdir-prpl.c
  • +0 -6
    libpurple/protocols/gg/status.c
  • +0 -11
    libpurple/protocols/gg/tcpsocket.c
  • +1 -1
    libpurple/protocols/gg/validator.c
  • +4 -0
    libpurple/protocols/novell/novell.c
  • +5 -3
    libpurple/protocols/oscar/clientlogin.c
  • +5 -6
    libpurple/protocols/oscar/visibility.c
  • +1 -1
    pidgin/gtkaccount.c
  • +3 -2
    pidgin/gtkconv.c
  • +8 -0
    pidgin/gtkprefs.c
  • +2 -2
    pidgin/plugins/disco/gtkdisco.c
  • +0 -1
    po/POTFILES.in
    • --- a/ChangeLog Wed Jun 18 00:51:08 2014 +0530
    +++ b/ChangeLog Fri Jun 27 01:07:11 2014 +0530
    @@ -1527,7 +1527,7 @@
    Finch:
    * The TinyURL plugin now creates shorter URLs for long non-conversation
    URLs, e.g. URLs to open Inbox in Yahoo/MSN protocols, or the Yahoo
    - Captcha when joining chat rooms.
    + CAPTCHA when joining chat rooms.
    * Fix displaying umlauts etc. in non-utf8 locale (fix in libgnt).
    Pidgin:
    --- a/Makefile.am Wed Jun 18 00:51:08 2014 +0530
    +++ b/Makefile.am Fri Jun 27 01:07:11 2014 +0530
    @@ -118,7 +118,7 @@
    (hg --cwd $(srcdir) id -i --debug) 2>/dev/null >$@.new \
    || rm -f $@.new
    $(AM_V_at)if test -f $@.new; then \
    - if ! diff $@ $@.new > /dev/null; then \
    + if ! test -f "$@" || ! diff "$@" "$@".new > /dev/null ; then \
    mv $@.new $@; \
    else \
    rm $@.new; \
    --- a/finch/gntconv.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/finch/gntconv.c Fri Jun 27 01:07:11 2014 +0530
    @@ -1335,8 +1335,9 @@
    g_string_append(s, _("No such command (in this context)."));
    }
    } else {
    - s = g_string_new(_("Use \"/help <command>\" for help on a specific command.\n"
    - "The following commands are available in this context:\n"));
    + s = g_string_new(_("Use \"/help <command>\" for help with a "
    + "specific command.\nThe following commands are available in "
    + "this context:\n"));
    text = purple_cmd_list(conv);
    for (l = text; l; l = l->next)
    --- a/finch/plugins/lastlog.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/finch/plugins/lastlog.c Fri Jun 27 01:07:11 2014 +0530
    @@ -118,7 +118,7 @@
    {
    cmd = purple_cmd_register("lastlog", "s", PURPLE_CMD_P_DEFAULT,
    PURPLE_CMD_FLAG_CHAT | PURPLE_CMD_FLAG_IM, NULL,
    - /* Translator Note: The "backlog" is the conversation buffer/history. */
    + /* Translators: The "backlog" here refers to the the conversation buffer/history. */
    lastlog_cb, _("lastlog: Searches for a substring in the backlog."), NULL);
    return TRUE;
    }
    --- a/libpurple/conversation.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/conversation.c Fri Jun 27 01:07:11 2014 +0530
    @@ -88,7 +88,8 @@
    PurpleConnection *gc;
    PurpleConversationPrivate *priv = PURPLE_CONVERSATION_GET_PRIVATE(conv);
    PurpleMessage *msg;
    - char *displayed = NULL, *sent = NULL;
    + char *displayed = NULL;
    + const char *sent;
    int err = 0;
    g_return_if_fail(priv != NULL);
    @@ -113,9 +114,9 @@
    if (displayed && (priv->features & PURPLE_CONNECTION_FLAG_HTML) &&
    !(msgflags & PURPLE_MESSAGE_RAW)) {
    - sent = g_strdup(displayed);
    + sent = displayed;
    } else
    - sent = g_strdup(message);
    + sent = message;
    msgflags |= PURPLE_MESSAGE_SEND;
    @@ -130,8 +131,11 @@
    err = purple_serv_send_im(gc, msg);
    - if ((err > 0) && (displayed != NULL))
    + if ((err > 0) && (displayed != NULL)) {
    + /* revert the contents in case sending-im-msg changed it */
    + purple_message_set_contents(msg, displayed);
    purple_conversation_write_message(conv, msg);
    + }
    purple_signal_emit(purple_conversations_get_handle(),
    "sent-im-msg", account, msg);
    @@ -187,7 +191,6 @@
    }
    g_free(displayed);
    - g_free(sent);
    }
    static void
    --- a/libpurple/keyring.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/keyring.c Fri Jun 27 01:07:11 2014 +0530
    @@ -716,7 +716,7 @@
    if (error != NULL) {
    *error = g_error_new(PURPLE_KEYRING_ERROR,
    PURPLE_KEYRING_ERROR_INTERNAL,
    - _("Specified keyring id does not match the "
    + _("Specified keyring ID does not match the "
    "loaded one."));
    }
    purple_debug_error("keyring",
    --- a/libpurple/media/backend-fs2.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/media/backend-fs2.c Fri Jun 27 01:07:11 2014 +0530
    @@ -1004,7 +1004,7 @@
    case FS_ERROR_NEGOTIATION_FAILED:
    purple_media_error_fs(priv->media,
    _("Codec negotiation failed. "
    - "This problem might be resolved by installing"
    + "This problem might be resolved by installing "
    "more GStreamer codecs."),
    structure);
    error_emitted = TRUE;
    @@ -1014,7 +1014,7 @@
    purple_media_error(priv->media,
    _("No codecs found. "
    "Install some GStreamer codecs found "
    - " in GStreamer plugins packages."));
    + "in GStreamer plugins packages."));
    error_emitted = TRUE;
    purple_media_end(priv->media, NULL, NULL);
    break;
    --- a/libpurple/plugins/keyrings/secretservice.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/plugins/keyrings/secretservice.c Fri Jun 27 01:07:11 2014 +0530
    @@ -43,6 +43,11 @@
    #include <libsecret/secret.h>
    +/* Translators: Secret Service is a service that runs on the user's computer.
    + It is one option for where the user's passwords can be stored. It is a
    + project name. It may not be appropriate to translate this string, but
    + transliterating to your alphabet is reasonable. More info about the
    + project can be found at https://wiki.gnome.org/Projects/Libsecret */
    #define SECRETSERVICE_NAME N_("Secret Service")
    #define SECRETSERVICE_ID "keyring-libsecret"
    #define SECRETSERVICE_DOMAIN (g_quark_from_static_string(SECRETSERVICE_ID))
    --- a/libpurple/protocols/gg/Makefile.am Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/Makefile.am Fri Jun 27 01:07:11 2014 +0530
    @@ -67,8 +67,6 @@
    blist.h \
    chat.c \
    chat.h \
    - deprecated.c \
    - deprecated.h \
    edisc.c \
    edisc.h \
    gg.c \
    --- a/libpurple/protocols/gg/Makefile.mingw Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/Makefile.mingw Fri Jun 27 01:07:11 2014 +0530
    @@ -49,7 +49,6 @@
    avatar.c \
    blist.c \
    chat.c \
    - deprecated.c \
    edisc.c \
    gg.c \
    html.c \
    --- a/libpurple/protocols/gg/account.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/account.c Fri Jun 27 01:07:11 2014 +0530
    @@ -32,7 +32,6 @@
    #include <libgadu.h>
    #include <debug.h>
    -#include "deprecated.h"
    #include "purplew.h"
    #include "utils.h"
    #include "libgaduw.h"
    @@ -72,11 +71,6 @@
    purple_debug_info("gg", "ggp_account_token_request: "
    "requesting token...\n");
    - if (!ggp_deprecated_setup_proxy(gc)) {
    - callback(gc, NULL, user_data);
    - return;
    - }
    -
    h = gg_token(TRUE);
    if (!h) {
    @@ -234,7 +228,7 @@
    _("Remember password"), register_data->password_remember);
    purple_request_field_group_add_field(password_group, field);
    - token_group = purple_request_field_group_new(_("Captcha"));
    + token_group = purple_request_field_group_new(_("CAPTCHA"));
    purple_request_fields_add_group(fields, token_group);
    field = purple_request_field_string_new("token_value",
    @@ -245,7 +239,7 @@
    purple_request_field_group_add_field(token_group, field);
    purple_debug_info("gg", "token set %p\n", register_data->token);
    - field = purple_request_field_image_new("token_image", _("Captcha"),
    + field = purple_request_field_image_new("token_image", _("CAPTCHA"),
    token->data, token->size);
    purple_request_field_group_add_field(token_group, field);
    @@ -490,7 +484,7 @@
    field_password);
    purple_request_field_group_add_field(password_group, field);
    - token_group = purple_request_field_group_new(_("Captcha"));
    + token_group = purple_request_field_group_new(_("CAPTCHA"));
    purple_request_fields_add_group(fields, token_group);
    field = purple_request_field_string_new("token_value",
    @@ -500,7 +494,7 @@
    purple_request_field_set_validator(field, ggp_validator_token, token);
    purple_request_field_group_add_field(token_group, field);
    - field = purple_request_field_image_new("token_image", _("Captcha"),
    + field = purple_request_field_image_new("token_image", _("CAPTCHA"),
    token->data, token->size);
    purple_request_field_group_add_field(token_group, field);
    --- a/libpurple/protocols/gg/chat.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/chat.c Fri Jun 27 01:07:11 2014 +0530
    @@ -33,8 +33,6 @@
    #include "utils.h"
    #include "message-prpl.h"
    -#if GGP_ENABLE_GG11
    -
    typedef struct _ggp_chat_local_info ggp_chat_local_info;
    struct _ggp_chat_session_data
    @@ -588,6 +586,10 @@
    if (chat->conv)
    status = _("Joined");
    else if (chat->left)
    + /* Translators: For Gadu-Gadu, this is one possible status for a
    + chat room. It means you had previously joined the chat room but
    + you have since left it. You cannot rejoin without another
    + invitation. */
    status = _("Chat left");
    else {
    status = _("Can join chat");
    @@ -611,13 +613,3 @@
    purple_timeout_add(1, ggp_chat_roomlist_get_list_finish, roomlist);
    return roomlist;
    }
    -
    -#else
    -void ggp_chat_setup(PurpleConnection *gc)
    -{
    -}
    -
    -void ggp_chat_cleanup(PurpleConnection *gc)
    -{
    -}
    -#endif
    --- a/libpurple/protocols/gg/chat.h Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/chat.h Fri Jun 27 01:07:11 2014 +0530
    @@ -38,7 +38,6 @@
    void ggp_chat_setup(PurpleConnection *gc);
    void ggp_chat_cleanup(PurpleConnection *gc);
    -#if GGP_ENABLE_GG11
    void ggp_chat_got_event(PurpleConnection *gc, const struct gg_event *ev);
    GList * ggp_chat_info(PurpleConnection *gc);
    @@ -55,6 +54,5 @@
    const char *message, time_t time, uin_t who);
    PurpleRoomlist * ggp_chat_roomlist_get_list(PurpleConnection *gc);
    -#endif
    #endif /* _GGP_CHAT_H */
    --- a/libpurple/protocols/gg/deprecated.c Wed Jun 18 00:51:08 2014 +0530
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,67 +0,0 @@
    -/* purple
    - *
    - * Purple is the legal property of its developers, whose names are too numerous
    - * to list here. Please refer to the COPYRIGHT file distributed with this
    - * source distribution.
    - *
    - * Rewritten from scratch during Google Summer of Code 2012
    - * by Tomek Wasilczyk (http://www.wasilczyk.pl).
    - *
    - * Previously implemented by:
    - * - Arkadiusz Miskiewicz <misiek@pld.org.pl> - first implementation (2001);
    - * - Bartosz Oler <bartosz@bzimage.us> - reimplemented during GSoC 2005;
    - * - Krzysztof Klinikowski <grommasher@gmail.com> - some parts (2009-2011).
    - *
    - * This program is free software; you can redistribute it and/or modify
    - * it under the terms of the GNU General Public License as published by
    - * the Free Software Foundation; either version 2 of the License, or
    - * (at your option) any later version.
    - *
    - * This program is distributed in the hope that it will be useful,
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    - * GNU General Public License for more details.
    - *
    - * You should have received a copy of the GNU General Public License
    - * along with this program; if not, write to the Free Software
    - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    - */
    -
    -#include "deprecated.h"
    -
    -#include <libgadu.h>
    -
    -#include "gg.h"
    -
    -gboolean ggp_deprecated_setup_proxy(PurpleConnection *gc)
    -{
    -#if ! GGP_ENABLE_GG11
    - PurpleProxyInfo *gpi = purple_proxy_get_setup(purple_connection_get_account(gc));
    -
    - if ((purple_proxy_info_get_proxy_type(gpi) != PURPLE_PROXY_NONE) &&
    - (purple_proxy_info_get_host(gpi) == NULL ||
    - purple_proxy_info_get_port(gpi) <= 0))
    - {
    - gg_proxy_enabled = 0;
    - purple_notify_error(NULL, NULL, _("Invalid proxy settings"),
    - _("Either the host name or port number specified for "
    - "your given proxy type is invalid."),
    - purple_request_cpar_from_connection(gc));
    - return FALSE;
    - }
    -
    - if (purple_proxy_info_get_proxy_type(gpi) == PURPLE_PROXY_NONE) {
    - gg_proxy_enabled = 0;
    - return TRUE;
    - }
    -
    - gg_proxy_enabled = 1;
    - /* TODO: memleak */
    - gg_proxy_host = g_strdup(purple_proxy_info_get_host(gpi));
    - gg_proxy_port = purple_proxy_info_get_port(gpi);
    - gg_proxy_username = g_strdup(purple_proxy_info_get_username(gpi));
    - gg_proxy_password = g_strdup(purple_proxy_info_get_password(gpi));
    -#endif
    -
    - return TRUE;
    -}
    --- a/libpurple/protocols/gg/deprecated.h Wed Jun 18 00:51:08 2014 +0530
    +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
    @@ -1,37 +0,0 @@
    -/* purple
    - *
    - * Purple is the legal property of its developers, whose names are too numerous
    - * to list here. Please refer to the COPYRIGHT file distributed with this
    - * source distribution.
    - *
    - * Rewritten from scratch during Google Summer of Code 2012
    - * by Tomek Wasilczyk (http://www.wasilczyk.pl).
    - *
    - * Previously implemented by:
    - * - Arkadiusz Miskiewicz <misiek@pld.org.pl> - first implementation (2001);
    - * - Bartosz Oler <bartosz@bzimage.us> - reimplemented during GSoC 2005;
    - * - Krzysztof Klinikowski <grommasher@gmail.com> - some parts (2009-2011).
    - *
    - * This program is free software; you can redistribute it and/or modify
    - * it under the terms of the GNU General Public License as published by
    - * the Free Software Foundation; either version 2 of the License, or
    - * (at your option) any later version.
    - *
    - * This program is distributed in the hope that it will be useful,
    - * but WITHOUT ANY WARRANTY; without even the implied warranty of
    - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    - * GNU General Public License for more details.
    - *
    - * You should have received a copy of the GNU General Public License
    - * along with this program; if not, write to the Free Software
    - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
    - */
    -
    -#ifndef _GGP_DEPRECATED_H
    -#define _GGP_DEPRECATED_H
    -
    -#include <internal.h>
    -
    -gboolean ggp_deprecated_setup_proxy(PurpleConnection *gc);
    -
    -#endif /* _GGP_DEPRECATED_H */
    --- a/libpurple/protocols/gg/gg.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/gg.c Fri Jun 27 01:07:11 2014 +0530
    @@ -44,7 +44,6 @@
    #include "blist.h"
    #include "utils.h"
    #include "resolver-purple.h"
    -#include "deprecated.h"
    #include "purplew.h"
    #include "libgadu-events.h"
    #include "multilogon.h"
    @@ -321,12 +320,10 @@
    return;
    }
    -#if GGP_ENABLE_GG11
    if (purple_debug_is_verbose()) {
    purple_debug_misc("gg", "ggp_callback_recv: got event %s",
    gg_debug_event(ev->type));
    }
    -#endif
    purple_input_remove(info->inpa);
    info->inpa = purple_input_add(info->session->fd,
    @@ -346,9 +343,7 @@
    ggp_message_got(gc, &ev->event.msg);
    break;
    case GG_EVENT_ACK:
    -#if GGP_ENABLE_GG11
    case GG_EVENT_ACK110:
    -#endif
    break;
    case GG_EVENT_IMAGE_REPLY:
    ggp_image_recv(gc, &ev->event.image_reply);
    @@ -371,11 +366,9 @@
    case GG_EVENT_USER_DATA:
    ggp_events_user_data(gc, &ev->event.user_data);
    break;
    -#if GGP_ENABLE_GG11
    case GG_EVENT_JSON_EVENT:
    ggp_events_json(gc, &ev->event.json_event);
    break;
    -#endif
    case GG_EVENT_USERLIST100_VERSION:
    ggp_roster_version(gc, &ev->event.userlist100_version);
    break;
    @@ -388,7 +381,6 @@
    case GG_EVENT_MULTILOGON_INFO:
    ggp_multilogon_info(gc, &ev->event.multilogon_info);
    break;
    -#if GGP_ENABLE_GG11
    case GG_EVENT_IMTOKEN:
    purple_debug_info("gg", "gg11: got IMTOKEN\n");
    g_free(info->imtoken);
    @@ -405,7 +397,6 @@
    case GG_EVENT_CHAT_INVITE_ACK:
    ggp_chat_got_event(gc, ev);
    break;
    -#endif
    case GG_EVENT_DISCONNECT:
    ggp_servconn_remote_disconnect(gc);
    break;
    @@ -459,14 +450,12 @@
    case GG_STATE_TLS_NEGOTIATION:
    purple_debug_info("gg", "GG_STATE_TLS_NEGOTIATION\n");
    break;
    -#if GGP_ENABLE_GG11
    case GG_STATE_RESOLVING_HUB:
    purple_debug_info("gg", "GG_STATE_RESOLVING_HUB\n");
    break;
    case GG_STATE_READING_HUB:
    purple_debug_info("gg", "GG_STATE_READING_HUB\n");
    break;
    -#endif
    default:
    purple_debug_error("gg", "unknown state = %d\n",
    info->session->state);
    @@ -501,13 +490,11 @@
    break;
    case GG_EVENT_CONN_SUCCESS:
    {
    -#if GGP_ENABLE_GG11
    purple_debug_info("gg", "GG_EVENT_CONN_SUCCESS:"
    " successfully connected to %s\n",
    info->session->connect_host);
    ggp_servconn_add_server(info->session->
    connect_host);
    -#endif
    purple_input_remove(info->inpa);
    info->inpa = purple_input_add(info->session->fd,
    PURPLE_INPUT_READ,
    @@ -570,13 +557,11 @@
    _("Error connecting to master "
    "server"));
    break;
    -#if GGP_ENABLE_GG11
    case GG_FAILURE_INTERNAL:
    purple_connection_error(gc,
    PURPLE_CONNECTION_ERROR_OTHER_ERROR,
    _("Internal error"));
    break;
    -#endif
    default:
    purple_connection_error(gc,
    PURPLE_CONNECTION_ERROR_NETWORK_ERROR,
    @@ -668,25 +653,15 @@
    PurpleConnection *gc = purple_account_get_connection(account);
    struct gg_login_params *glp;
    GGPInfo *info;
    -#if GGP_ENABLE_GG11
    const char *address;
    -#endif
    const gchar *encryption_type, *protocol_version;
    - if (!ggp_deprecated_setup_proxy(gc))
    - return;
    -
    purple_connection_set_flags(gc,
    -#if ! GGP_ENABLE_GG11
    - PURPLE_CONNECTION_FLAG_NO_IMAGES |
    -#endif
    PURPLE_CONNECTION_FLAG_HTML |
    PURPLE_CONNECTION_FLAG_NO_URLDESC);
    glp = g_new0(struct gg_login_params, 1);
    -#if GGP_ENABLE_GG11
    glp->struct_size = sizeof(struct gg_login_params);
    -#endif
    info = g_new0(GGPInfo, 1);
    purple_connection_set_protocol_data(gc, info);
    @@ -753,28 +728,20 @@
    "protocol_version", "default");
    purple_debug_info("gg", "Requested protocol version: %s\n",
    protocol_version);
    -#if GGP_ENABLE_GG11
    if (g_strcmp0(protocol_version, "gg10") == 0)
    glp->protocol_version = GG_PROTOCOL_VERSION_100;
    else if (g_strcmp0(protocol_version, "gg11") == 0)
    glp->protocol_version = GG_PROTOCOL_VERSION_110;
    glp->compatibility = GG_COMPAT_1_12_0;
    -#else
    - glp->protocol_version = 0x2e;
    -#endif
    ggp_status_set_initial(gc, glp);
    -#if GGP_ENABLE_GG11
    address = purple_account_get_string(account, "gg_server", "");
    if (address && *address)
    glp->connect_host = g_strdup(address);
    -#endif
    info->session = gg_login(glp);
    -#if GGP_ENABLE_GG11
    g_free(glp->connect_host);
    -#endif
    purple_str_wipe(glp->password);
    g_free(glp);
    @@ -1076,7 +1043,6 @@
    im_iface->send_typing = ggp_send_typing;
    }
    -#if GGP_ENABLE_GG11
    static void
    ggp_protocol_chat_iface_init(PurpleProtocolChatIface *chat_iface)
    {
    @@ -1096,7 +1062,6 @@
    {
    roomlist_iface->get_list = ggp_chat_roomlist_get_list;
    }
    -#endif
    static void
    ggp_protocol_privacy_iface_init(PurpleProtocolPrivacyIface *privacy_iface)
    @@ -1124,13 +1089,13 @@
    PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_IM_IFACE,
    ggp_protocol_im_iface_init)
    -#if GGP_ENABLE_GG11
    +
    PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CHAT_IFACE,
    ggp_protocol_chat_iface_init)
    PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_ROOMLIST_IFACE,
    ggp_protocol_roomlist_iface_init)
    -#endif
    +
    PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_PRIVACY_IFACE,
    ggp_protocol_privacy_iface_init)
    --- a/libpurple/protocols/gg/gg.h Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/gg.h Fri Jun 27 01:07:11 2014 +0530
    @@ -26,12 +26,6 @@
    #define GGP_UIN_LEN_MAX 10
    -#ifdef _WIN32
    -#define GGP_ENABLE_GG11 1
    -#else
    -#define GGP_ENABLE_GG11 0
    -#endif
    -
    #include <libgadu.h>
    #include "internal.h"
    --- a/libpurple/protocols/gg/libgadu-events.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/libgadu-events.c Fri Jun 27 01:07:11 2014 +0530
    @@ -79,7 +79,6 @@
    }
    }
    -#if GGP_ENABLE_GG11
    static void ggp_events_new_version(const gchar *data)
    {
    /* data = {"severity":"download"} */
    @@ -121,4 +120,3 @@
    purple_debug_warning("gg", "ggp_events_json: "
    "unhandled event \"%s\"\n", ev->type);
    }
    -#endif
    --- a/libpurple/protocols/gg/libgadu-events.h Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/libgadu-events.h Fri Jun 27 01:07:11 2014 +0530
    @@ -38,8 +38,6 @@
    void ggp_events_user_data(PurpleConnection *gc,
    struct gg_event_user_data *data);
    -#if GGP_ENABLE_GG11
    void ggp_events_json(PurpleConnection *gc, struct gg_event_json_event *ev);
    -#endif
    #endif /* _GGP_LIBGADU_EVENTS_H */
    --- a/libpurple/protocols/gg/libgaduw.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/libgaduw.c Fri Jun 27 01:07:11 2014 +0530
    @@ -71,12 +71,8 @@
    PurpleDebugLevel purple_level;
    char *msg;
    - if ((level & GG_DEBUG_NET) ||
    - (level & GG_DEBUG_FUNCTION)
    -#if GGP_ENABLE_GG11
    - || (level & GG_DEBUG_VERBOSE)
    -#endif
    - )
    + if ((level & GG_DEBUG_NET) || (level & GG_DEBUG_FUNCTION) ||
    + (level & GG_DEBUG_VERBOSE))
    {
    if (!purple_debug_is_verbose())
    return;
    @@ -91,13 +87,11 @@
    msg = g_strdup_vprintf(format, args);
    -#if GGP_ENABLE_GG11
    if (level & GG_DEBUG_ERROR)
    purple_level = PURPLE_DEBUG_ERROR;
    else if (level & GG_DEBUG_WARNING)
    purple_level = PURPLE_DEBUG_WARNING;
    else
    -#endif
    purple_level = PURPLE_DEBUG_MISC;
    purple_debug(purple_level, "gg", "%s", msg);
    --- a/libpurple/protocols/gg/message-prpl.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/message-prpl.c Fri Jun 27 01:07:11 2014 +0530
    @@ -189,13 +189,10 @@
    msg->time = ev->time;
    msg->user = ev->sender;
    -#if GGP_ENABLE_GG11
    if (ev->chat_id != 0) {
    msg->type = GGP_MESSAGE_GOT_TYPE_CHAT;
    msg->chat_id = ev->chat_id;
    - } else
    -#endif
    - {
    + } else {
    msg->type = GGP_MESSAGE_GOT_TYPE_IM;
    }
    @@ -214,13 +211,10 @@
    msg->time = ev->time;
    msg->user = ev->sender; /* not really a sender*/
    -#if GGP_ENABLE_GG11
    if (ev->chat_id != 0) {
    msg->type = GGP_MESSAGE_GOT_TYPE_CHAT;
    msg->chat_id = ev->chat_id;
    - } else
    -#endif
    - {
    + } else {
    msg->type = GGP_MESSAGE_GOT_TYPE_MULTILOGON;
    }
    @@ -236,14 +230,10 @@
    if (msg->type == GGP_MESSAGE_GOT_TYPE_IM) {
    purple_serv_got_im(gc, ggp_uin_to_str(msg->user), msg->text,
    PURPLE_MESSAGE_RECV, msg->time);
    - }
    -#if GGP_ENABLE_GG11
    - else if (msg->type == GGP_MESSAGE_GOT_TYPE_CHAT) {
    + } else if (msg->type == GGP_MESSAGE_GOT_TYPE_CHAT) {
    ggp_chat_got_message(gc, msg->chat_id, msg->text, msg->time,
    msg->user);
    - }
    -#endif
    - else if (msg->type == GGP_MESSAGE_GOT_TYPE_MULTILOGON) {
    + } else if (msg->type == GGP_MESSAGE_GOT_TYPE_MULTILOGON) {
    PurpleIMConversation *im = ggp_message_get_conv(gc, msg->user);
    PurpleMessage *pmsg;
    @@ -668,17 +658,8 @@
    return -E2BIG;
    }
    -#if GGP_ENABLE_GG11
    succ = (gg_send_message_html(info->session, GG_CLASS_CHAT,
    ggp_str_to_uin(rcpt), (unsigned char *)gg_msg) >= 0);
    -#else
    - {
    - gchar *plain = purple_markup_strip_html(gg_msg);
    - succ = (gg_send_message(info->session, GG_CLASS_CHAT,
    - ggp_str_to_uin(rcpt), (unsigned char *)plain) >= 0);
    - g_free(plain);
    - }
    -#endif
    g_free(gg_msg);
    --- a/libpurple/protocols/gg/pubdir-prpl.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/pubdir-prpl.c Fri Jun 27 01:07:11 2014 +0530
    @@ -839,6 +839,12 @@
    record ? record->city : NULL, FALSE);
    purple_request_field_group_add_field(group, field);
    + /* Translators: This word is basically used to describe a Polish
    + province. Gadu-Gadu users outside of Poland might choose to enter some
    + equivalent value for themselves. For example, users in the USA might
    + use their state (e.g. New York). If there is an equivalent term for
    + your language, feel free to use it. Otherwise it's probably acceptable
    + to leave it changed or transliterate it into your alphabet. */
    field = purple_request_field_choice_new("province", _("Voivodeship"), 0);
    purple_request_field_group_add_field(group, field);
    for (i = 0; i < ggp_pubdir_provinces_count; i++) {
    --- a/libpurple/protocols/gg/status.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/status.c Fri Jun 27 01:07:11 2014 +0530
    @@ -161,9 +161,7 @@
    case GG_STATUS_NOT_AVAIL:
    case GG_STATUS_NOT_AVAIL_DESCR:
    case GG_STATUS_BLOCKED:
    -#if GGP_ENABLE_GG11
    case GG_STATUS_UNKNOWN:
    -#endif
    return purple_primitive_get_id_from_type(
    PURPLE_STATUS_OFFLINE);
    case GG_STATUS_FFC:
    @@ -415,11 +413,7 @@
    return;
    }
    ggp_buddy_get_data(buddy)->blocked = (status == GG_STATUS_BLOCKED);
    -#if GGP_ENABLE_GG11
    ggp_buddy_get_data(buddy)->not_a_friend = (status == GG_STATUS_UNKNOWN);
    -#else
    - ggp_buddy_get_data(buddy)->not_a_friend = FALSE;
    -#endif
    if (descr != NULL) {
    status_message = g_strdup(descr);
    --- a/libpurple/protocols/gg/tcpsocket.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/tcpsocket.c Fri Jun 27 01:07:11 2014 +0530
    @@ -32,8 +32,6 @@
    #include "debug.h"
    #include "purple-socket.h"
    -#if GGP_ENABLE_GG11
    -
    static void
    ggp_tcpsocket_connected(PurpleSocket *ps, const gchar *error, gpointer priv_gg)
    {
    @@ -124,15 +122,6 @@
    glp->socket_manager.write_cb = ggp_tcpsocket_write;
    }
    -#else
    -
    -void
    -ggp_tcpsocket_setup(PurpleConnection *gc, struct gg_login_params *glp)
    -{
    -}
    -
    -#endif
    -
    PurpleInputCondition
    ggp_tcpsocket_inputcond_gg_to_purple(enum gg_check_t check)
    {
    --- a/libpurple/protocols/gg/validator.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/gg/validator.c Fri Jun 27 01:07:11 2014 +0530
    @@ -49,7 +49,7 @@
    return TRUE;
    if (errmsg)
    - *errmsg = g_strdup(_("Captcha validation failed"));
    + *errmsg = g_strdup(_("CAPTCHA validation failed"));
    return FALSE;
    }
    #endif
    --- a/libpurple/protocols/novell/novell.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/novell/novell.c Fri Jun 27 01:07:11 2014 +0530
    @@ -1541,6 +1541,10 @@
    }
    #if 0
    + /* Hint for translators: "DN" here refers to a piece of information about
    + a user on the Novell protocol. "DN" is not an English word. I think
    + it's an abbreviation, possibly for "distinguished name" as defined in
    + the X.500 standard. It's probably fine to leave it untranslated. */
    tag = _("DN");
    value = nm_user_record_get_dn(user_record);
    if (value) {
    --- a/libpurple/protocols/oscar/clientlogin.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/oscar/clientlogin.c Fri Jun 27 01:07:11 2014 +0530
    @@ -114,8 +114,11 @@
    }
    if (details && *details) {
    + /* Translators: The first %s is a URL. The second is a brief error
    + message. */
    err = g_strdup_printf(_("Received unexpected response from %s: %s"), url, details);
    } else {
    + /* Translators: %s in this string is a URL */
    err = g_strdup_printf(_("Received unexpected response from %s"), url);
    }
    @@ -182,7 +185,6 @@
    char *msg;
    purple_debug_error("oscar", "startOSCARSession could not parse "
    "response as XML: %s\n", response);
    - /* Note to translators: %s in this string is a URL */
    msg = generate_error_message(response_node,
    get_start_oscar_session_url(od));
    purple_connection_error(gc,
    @@ -338,8 +340,8 @@
    if (!purple_http_response_is_successful(response)) {
    gchar *tmp;
    - /* Note to translators: The first %s is a URL, the second is an
    - error message. */
    + /* Translators: The first %s is a URL, the second is a brief error
    + message. */
    tmp = g_strdup_printf(_("Error requesting %s: %s"),
    get_start_oscar_session_url(od),
    purple_http_response_get_error(response));
    --- a/libpurple/protocols/oscar/visibility.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/libpurple/protocols/oscar/visibility.c Fri Jun 27 01:07:11 2014 +0530
    @@ -125,16 +125,15 @@
    oscar_show_visible_list(PurpleProtocolAction *action)
    {
    show_private_list(action, AIM_SSI_TYPE_PERMIT, _("Visible List"),
    - _("These buddies will see "
    - "your status when you switch "
    - "to \"Invisible\""),
    - _(APPEAR_ONLINE));
    + _("These buddies can see your status even when you're "
    + "invisible."),
    + _(APPEAR_ONLINE));
    }
    void
    oscar_show_invisible_list(PurpleProtocolAction *action)
    {
    show_private_list(action, AIM_SSI_TYPE_DENY, _("Invisible List"),
    - _("These buddies will always see you as offline"),
    - _(APPEAR_OFFLINE));
    + _("These buddies will always see you as offline."),
    + _(APPEAR_OFFLINE));
    }
    --- a/pidgin/gtkaccount.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/pidgin/gtkaccount.c Fri Jun 27 01:07:11 2014 +0530
    @@ -2896,7 +2896,7 @@
    escaped_alias,
    (have_valid_alias ? ")" : ""),
    escaped_our_name,
    - (have_valid_alias ? ": " : "."),
    + (*escaped_message ? ": " : "."),
    escaped_message);
    g_free(escaped_remote_user);
    --- a/pidgin/gtkconv.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/pidgin/gtkconv.c Fri Jun 27 01:07:11 2014 +0530
    @@ -486,8 +486,9 @@
    g_string_append(s, _("No such command (in this context)."));
    }
    } else {
    - s = g_string_new(_("Use \"/help &lt;command&gt;\" for help on a specific command.<br/>"
    - "The following commands are available in this context:<br/>"));
    + s = g_string_new(_("Use \"/help &lt;command&gt;\" for help with a "
    + "specific command.<br/>The following commands are available "
    + "in this context:<br/>"));
    text = purple_cmd_list(conv);
    for (l = text; l; l = l->next)
    --- a/pidgin/gtkprefs.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/pidgin/gtkprefs.c Fri Jun 27 01:07:11 2014 +0530
    @@ -141,6 +141,9 @@
    "pulsesrc", "PulseAudio",
    "sndiosrc", "sndio",
    /* "audiotestsrc wave=silence", "Silence", */
    + /* Translators: This is a noun that refers to one possible audio input
    + plugin. The plugin can be used by the user to sanity check basic audio
    + functionality within Pidgin. */
    "audiotestsrc", N_("Test Sound"),
    NULL
    };
    @@ -159,6 +162,9 @@
    static const gchar *VIDEO_SRC_PLUGINS[] = {
    "videodisabledsrc", N_("Disabled"),
    + /* Translators: This is a noun that refers to one possible video input
    + plugin. The plugin can be used by the user to sanity check basic video
    + functionality within Pidgin. */
    "videotestsrc", N_("Test Input"),
    "dshowvideosrc","DirectDraw",
    "ksvideosrc", "KS Video",
    @@ -3492,6 +3498,8 @@
    }
    if (g_strcmp0(element_name, "videodisabledsrc") == 0) {
    + /* Translators: This string refers to 'static' or 'snow' sometimes
    + seen when trying to tune a TV to a non-existant analog station. */
    ret = g_list_prepend(ret, g_strdup(_("Random noise")));
    ret = g_list_prepend(ret, g_strdup("snow"));
    --- a/pidgin/plugins/disco/gtkdisco.c Wed Jun 18 00:51:08 2014 +0530
    +++ b/pidgin/plugins/disco/gtkdisco.c Fri Jun 27 01:07:11 2014 +0530
    @@ -242,8 +242,8 @@
    /* This shouldn't ever happen since the account is connected */
    server = g_strdup("jabber.org");
    - /* Note to translators: The string "Enter an XMPP Server" is asking the
    - user to type the name of an XMPP server which will then be queried */
    + /* Translators: The string "Enter an XMPP Server" is asking the user to
    + type the name of an XMPP server which will then be queried */
    dialog->prompt_handle = purple_request_input(my_plugin, _("Server name request"), _("Enter an XMPP Server"),
    _("Select an XMPP server to query"),
    server, FALSE, FALSE, NULL,
    --- a/po/POTFILES.in Wed Jun 18 00:51:08 2014 +0530
    +++ b/po/POTFILES.in Fri Jun 27 01:07:11 2014 +0530
    @@ -91,7 +91,6 @@
    libpurple/protocols/bonjour/mdns_win32.c
    libpurple/protocols/gg/account.c
    libpurple/protocols/gg/chat.c
    -libpurple/protocols/gg/deprecated.c
    libpurple/protocols/gg/edisc.c
    libpurple/protocols/gg/gg.c
    libpurple/protocols/gg/image-prpl.c