pidgin/pidgin

Drop libgadu legacy API compatibility code

2014-06-18, Tomasz Wasilczyk
3dcb9b9b7c11
Parents faba3b092f55
Children 03ba2ca0be88
Drop libgadu legacy API compatibility code
15 files changed, 6 insertions(+), 230 deletions(-)
  • +0 -2
    libpurple/protocols/gg/Makefile.am
  • +0 -1
    libpurple/protocols/gg/Makefile.mingw
  • +0 -6
    libpurple/protocols/gg/account.c
  • +0 -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
  • +0 -45
    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
  • +0 -6
    libpurple/protocols/gg/status.c
  • +0 -11
    libpurple/protocols/gg/tcpsocket.c
    • --- a/libpurple/protocols/gg/Makefile.am Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/Makefile.am Wed Jun 18 11:40:53 2014 +0200
    @@ -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 Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/Makefile.mingw Wed Jun 18 11:40:53 2014 +0200
    @@ -49,7 +49,6 @@
    avatar.c \
    blist.c \
    chat.c \
    - deprecated.c \
    edisc.c \
    gg.c \
    html.c \
    --- a/libpurple/protocols/gg/account.c Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/account.c Wed Jun 18 11:40:53 2014 +0200
    @@ -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) {
    --- a/libpurple/protocols/gg/chat.c Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/chat.c Wed Jun 18 11:40:53 2014 +0200
    @@ -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
    @@ -611,13 +609,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 Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/chat.h Wed Jun 18 11:40:53 2014 +0200
    @@ -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 Tue Jun 17 22:24:37 2014 -0700
    +++ /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 Tue Jun 17 22:24:37 2014 -0700
    +++ /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 Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/gg.c Wed Jun 18 11:40:53 2014 +0200
    @@ -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"
    @@ -317,12 +316,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,
    @@ -342,9 +339,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);
    @@ -367,11 +362,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;
    @@ -384,7 +377,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);
    @@ -401,7 +393,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;
    @@ -455,14 +446,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);
    @@ -497,13 +486,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,
    @@ -566,13 +553,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,
    @@ -664,25 +649,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);
    @@ -749,28 +724,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);
    @@ -989,12 +956,8 @@
    ggp_tooltip_text, /* tooltip_text */
    ggp_status_types, /* status_types */
    NULL, /* blist_node_menu */
    -#if GGP_ENABLE_GG11
    ggp_chat_info, /* chat_info */
    ggp_chat_info_defaults, /* chat_info_defaults */
    -#else
    - NULL, NULL,
    -#endif
    ggp_login, /* login */
    ggp_close, /* close */
    ggp_message_send_im, /* send_im */
    @@ -1013,16 +976,12 @@
    NULL, /* rem_permit */
    ggp_rem_deny, /* rem_deny */
    NULL, /* set_permit_deny */
    -#if GGP_ENABLE_GG11
    ggp_chat_join, /* join_chat */
    NULL, /* TODO */ /* reject_chat */
    ggp_chat_get_name, /* get_chat_name */
    ggp_chat_invite, /* chat_invite */
    ggp_chat_leave, /* chat_leave */
    ggp_chat_send, /* chat_send */
    -#else
    - NULL, NULL, NULL, NULL, NULL, NULL,
    -#endif
    ggp_keepalive, /* keepalive */
    NULL, /* register_user */
    NULL, /* get_cb_info */
    @@ -1037,11 +996,7 @@
    NULL, /* get_cb_real_name */
    NULL, /* set_chat_topic */
    NULL, /* find_blist_chat */
    -#if GGP_ENABLE_GG11
    ggp_chat_roomlist_get_list, /* roomlist_get_list */
    -#else
    - NULL,
    -#endif
    NULL, /* roomlist_cancel */
    NULL, /* roomlist_expand_category */
    ggp_edisc_xfer_can_receive_file, /* can_receive_file */
    --- a/libpurple/protocols/gg/gg.h Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/gg.h Wed Jun 18 11:40:53 2014 +0200
    @@ -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 Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/libgadu-events.c Wed Jun 18 11:40:53 2014 +0200
    @@ -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 Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/libgadu-events.h Wed Jun 18 11:40:53 2014 +0200
    @@ -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 Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/libgaduw.c Wed Jun 18 11:40:53 2014 +0200
    @@ -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 Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/message-prpl.c Wed Jun 18 11:40:53 2014 +0200
    @@ -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/status.c Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/status.c Wed Jun 18 11:40:53 2014 +0200
    @@ -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 Tue Jun 17 22:24:37 2014 -0700
    +++ b/libpurple/protocols/gg/tcpsocket.c Wed Jun 18 11:40:53 2014 +0200
    @@ -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)
    {