pidgin/pidgin

Manual merge for 07e827917960

2014-01-29, Tomasz Wasilczyk
056b8468d470
Parents 6f0178580d5d
Children abc36dad1363
Manual merge for 07e827917960
8 files changed, 11 insertions(+), 18 deletions(-)
  • +0 -2
    libpurple/protocols/gg/Makefile.am
  • +0 -1
    libpurple/protocols/gg/Makefile.mingw
  • +2 -0
    libpurple/protocols/gg/account.h
  • +0 -1
    libpurple/protocols/gg/blist.h
  • +2 -12
    libpurple/protocols/gg/gg.c
  • +0 -1
    libpurple/protocols/gg/gg.h
  • +4 -1
    libpurple/protocols/gg/validator.c
  • +3 -0
    libpurple/protocols/gg/validator.h
    • --- a/libpurple/protocols/gg/Makefile.am Wed Jan 29 00:50:47 2014 +0530
    +++ b/libpurple/protocols/gg/Makefile.am Wed Jan 29 13:37:41 2014 +0100
    @@ -55,8 +55,6 @@
    GGSOURCES = \
    $(INTGGSOURCES) \
    - account.c \
    - account.h \
    avatar.c \
    avatar.h \
    blist.c \
    --- a/libpurple/protocols/gg/Makefile.mingw Wed Jan 29 00:50:47 2014 +0530
    +++ b/libpurple/protocols/gg/Makefile.mingw Wed Jan 29 13:37:41 2014 +0100
    @@ -46,7 +46,6 @@
    ## SOURCES, OBJECTS
    ##
    C_SRC = \
    - account.c \
    avatar.c \
    blist.c \
    chat.c \
    --- a/libpurple/protocols/gg/account.h Wed Jan 29 00:50:47 2014 +0530
    +++ b/libpurple/protocols/gg/account.h Wed Jan 29 13:37:41 2014 +0100
    @@ -30,6 +30,8 @@
    #ifndef _GGP_ACCOUNT_H
    #define _GGP_ACCOUNT_H
    +#error "This file is outdated"
    +
    #include <internal.h>
    typedef struct
    --- a/libpurple/protocols/gg/blist.h Wed Jan 29 00:50:47 2014 +0530
    +++ b/libpurple/protocols/gg/blist.h Wed Jan 29 13:37:41 2014 +0100
    @@ -25,7 +25,6 @@
    #define _PURPLE_GG_BLIST_H
    #include "connection.h"
    -#include "account.h"
    void
    ggp_buddylist_send(PurpleConnection *gc);
    --- a/libpurple/protocols/gg/gg.c Wed Jan 29 00:50:47 2014 +0530
    +++ b/libpurple/protocols/gg/gg.c Wed Jan 29 13:37:41 2014 +0100
    @@ -44,7 +44,6 @@
    #include "blist.h"
    #include "utils.h"
    #include "resolver-purple.h"
    -#include "account.h"
    #include "deprecated.h"
    #include "purplew.h"
    #include "libgadu-events.h"
    @@ -896,11 +895,6 @@
    ggp_multilogon_dialog((PurpleConnection *)action->context);
    }
    -static void ggp_action_chpass(PurplePluginAction *action)
    -{
    - ggp_account_chpass((PurpleConnection *)action->context);
    -}
    -
    static void ggp_action_status_broadcasting(PurplePluginAction *action)
    {
    ggp_status_broadcasting_dialog((PurpleConnection *)action->context);
    @@ -921,10 +915,6 @@
    GList *m = NULL;
    PurplePluginAction *act;
    - act = purple_plugin_action_new(_("Change password..."),
    - ggp_action_chpass);
    - m = g_list_append(m, act);
    -
    act = purple_plugin_action_new(_("Show other sessions"),
    ggp_action_multilogon);
    m = g_list_append(m, act);
    @@ -991,7 +981,7 @@
    static PurplePluginProtocolInfo prpl_info =
    {
    sizeof(PurplePluginProtocolInfo), /* struct_size */
    - OPT_PROTO_REGISTER_NOSCREENNAME | OPT_PROTO_IM_IMAGE,
    + OPT_PROTO_IM_IMAGE,
    NULL, /* user_splits */
    NULL, /* protocol_options */
    {"png", 1, 1, 200, 200, 0, PURPLE_ICON_SCALE_DISPLAY | PURPLE_ICON_SCALE_SEND}, /* icon_spec */
    @@ -1037,7 +1027,7 @@
    NULL, NULL, NULL, NULL, NULL, NULL, NULL,
    #endif
    ggp_keepalive, /* keepalive */
    - ggp_account_register, /* register_user */
    + NULL, /* register_user */
    NULL, /* get_cb_info */
    ggp_roster_alias_buddy, /* alias_buddy */
    ggp_roster_group_buddy, /* group_buddy */
    --- a/libpurple/protocols/gg/gg.h Wed Jan 29 00:50:47 2014 +0530
    +++ b/libpurple/protocols/gg/gg.h Wed Jan 29 13:37:41 2014 +0100
    @@ -40,7 +40,6 @@
    #include "image.h"
    #include "avatar.h"
    -#include "account.h"
    #include "roster.h"
    #include "multilogon.h"
    #include "status.h"
    --- a/libpurple/protocols/gg/validator.c Wed Jan 29 00:50:47 2014 +0530
    +++ b/libpurple/protocols/gg/validator.c Wed Jan 29 13:37:41 2014 +0100
    @@ -29,8 +29,10 @@
    #include "validator.h"
    +#include "utils.h"
    +
    +#if 0
    #include "account.h"
    -#include "utils.h"
    gboolean ggp_validator_token(PurpleRequestField *field, gchar **errmsg,
    void *token)
    @@ -50,6 +52,7 @@
    *errmsg = g_strdup(_("Captcha validation failed"));
    return FALSE;
    }
    +#endif
    gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,
    void *user_data)
    --- a/libpurple/protocols/gg/validator.h Wed Jan 29 00:50:47 2014 +0530
    +++ b/libpurple/protocols/gg/validator.h Wed Jan 29 13:37:41 2014 +0100
    @@ -33,8 +33,11 @@
    #include <internal.h>
    #include <request.h>
    +#if 0
    +/* see account.h */
    gboolean ggp_validator_token(PurpleRequestField *field, gchar **errmsg,
    void *token);
    +#endif
    gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,
    void *user_data);