/pidgin/main: 056b8468d470: Manual merge for 07e827917960

[Tomasz Wasilczyk]

Changeset: 056b8468d470f6819b6ca9615b77b80d27534de3
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2014-01-29 13:37 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/056b8468d470

Description:

Manual merge for 07e827917960

diffstat:

 libpurple/protocols/gg/Makefile.am    |   2 --
 libpurple/protocols/gg/Makefile.mingw |   1 -
 libpurple/protocols/gg/account.h      |   2 ++
 libpurple/protocols/gg/blist.h        |   1 -
 libpurple/protocols/gg/gg.c           |  14 ++------------
 libpurple/protocols/gg/gg.h           |   1 -
 libpurple/protocols/gg/validator.c    |   5 ++++-
 libpurple/protocols/gg/validator.h    |   3 +++
 8 files changed, 11 insertions(+), 18 deletions(-)

diffs (147 lines):

diff --git a/libpurple/protocols/gg/Makefile.am b/libpurple/protocols/gg/Makefile.am
--- a/libpurple/protocols/gg/Makefile.am
+++ b/libpurple/protocols/gg/Makefile.am
@@ -55,8 +55,6 @@ GADU_LIBS += $(JSON_LIBS)
 
 GGSOURCES = \
 	$(INTGGSOURCES) \
-	account.c \
-	account.h \
 	avatar.c \
 	avatar.h \
 	blist.c \
diff --git a/libpurple/protocols/gg/Makefile.mingw b/libpurple/protocols/gg/Makefile.mingw
--- a/libpurple/protocols/gg/Makefile.mingw
+++ b/libpurple/protocols/gg/Makefile.mingw
@@ -46,7 +46,6 @@ LIB_PATHS += \
 ##  SOURCES, OBJECTS
 ##
 C_SRC =	\
-	account.c \
 	avatar.c \
 	blist.c \
 	chat.c \
diff --git a/libpurple/protocols/gg/account.h b/libpurple/protocols/gg/account.h
--- a/libpurple/protocols/gg/account.h
+++ b/libpurple/protocols/gg/account.h
@@ -30,6 +30,8 @@
 #ifndef _GGP_ACCOUNT_H
 #define _GGP_ACCOUNT_H
 
+#error "This file is outdated"
+
 #include <internal.h>
 
 typedef struct
diff --git a/libpurple/protocols/gg/blist.h b/libpurple/protocols/gg/blist.h
--- a/libpurple/protocols/gg/blist.h
+++ b/libpurple/protocols/gg/blist.h
@@ -25,7 +25,6 @@
 #define _PURPLE_GG_BLIST_H
 
 #include "connection.h"
-#include "account.h"
 
 void
 ggp_buddylist_send(PurpleConnection *gc);
diff --git a/libpurple/protocols/gg/gg.c b/libpurple/protocols/gg/gg.c
--- a/libpurple/protocols/gg/gg.c
+++ b/libpurple/protocols/gg/gg.c
@@ -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 @@ static void ggp_action_multilogon(Purple
 	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 @@ static GList *ggp_actions(PurplePlugin *
 	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 @@ ggp_get_max_message_size(PurpleConversat
 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 @@ static PurplePluginProtocolInfo prpl_inf
 	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 */
diff --git a/libpurple/protocols/gg/gg.h b/libpurple/protocols/gg/gg.h
--- a/libpurple/protocols/gg/gg.h
+++ b/libpurple/protocols/gg/gg.h
@@ -40,7 +40,6 @@
 
 #include "image.h"
 #include "avatar.h"
-#include "account.h"
 #include "roster.h"
 #include "multilogon.h"
 #include "status.h"
diff --git a/libpurple/protocols/gg/validator.c b/libpurple/protocols/gg/validator.c
--- a/libpurple/protocols/gg/validator.c
+++ b/libpurple/protocols/gg/validator.c
@@ -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 @@ gboolean ggp_validator_token(PurpleReque
 		*errmsg = g_strdup(_("Captcha validation failed"));
 	return FALSE;
 }
+#endif
 
 gboolean ggp_validator_password(PurpleRequestField *field, gchar **errmsg,
 	void *user_data)
diff --git a/libpurple/protocols/gg/validator.h b/libpurple/protocols/gg/validator.h
--- a/libpurple/protocols/gg/validator.h
+++ b/libpurple/protocols/gg/validator.h
@@ -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);