/soc/2013/ankitkv/gobjectification: 88242596aaf9: Merged default...

[Ankit Vani]

Changeset: 88242596aaf911881f54c5278d965b8f626d867f
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2014-01-30 01:00 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/88242596aaf9

Description:

Merged default branch

diffstat:

 libpurple/glibcompat.h                |   5 +++--
 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 +++
 9 files changed, 13 insertions(+), 21 deletions(-)

diffs (169 lines):

diff --git a/libpurple/glibcompat.h b/libpurple/glibcompat.h
--- a/libpurple/glibcompat.h
+++ b/libpurple/glibcompat.h
@@ -25,6 +25,9 @@
  * Also, any public API should not depend on this file.
  */
 
+#include <glib.h>
+
+
 #ifdef __clang__
 
 #undef G_GNUC_BEGIN_IGNORE_DEPRECATIONS
@@ -39,8 +42,6 @@
 #endif /* __clang__ */
 
 
-#include <glib.h>
-
 #if !GLIB_CHECK_VERSION(2, 32, 0)
 
 #include <glib-object.h>
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"
@@ -900,11 +899,6 @@ static void ggp_action_multilogon(Purple
 	ggp_multilogon_dialog(action->connection);
 }
 
-static void ggp_action_chpass(PurpleProtocolAction *action)
-{
-	ggp_account_chpass(action->connection);
-}
-
 static void ggp_action_status_broadcasting(PurpleProtocolAction *action)
 {
 	ggp_status_broadcasting_dialog(action->connection);
@@ -925,10 +919,6 @@ static GList *ggp_get_actions(PurpleConn
 	GList *m = NULL;
 	PurpleProtocolAction *act;
 
-	act = purple_protocol_action_new(_("Change password..."),
-		ggp_action_chpass);
-	m = g_list_append(m, act);
-
 	act = purple_protocol_action_new(_("Show other sessions"),
 		ggp_action_multilogon);
 	m = g_list_append(m, act);
@@ -1001,8 +991,7 @@ ggp_protocol_init(PurpleProtocol *protoc
 
 	protocol->id        = "prpl-gg";
 	protocol->name      = "Gadu-Gadu";
-	protocol->options   = OPT_PROTO_REGISTER_NOSCREENNAME |
-	                      OPT_PROTO_IM_IMAGE;
+	protocol->options   = OPT_PROTO_IM_IMAGE;
 	protocol->icon_spec = purple_buddy_icon_spec_new("png",
 	                                                 1, 1, 200, 200, 0,
 	                                                 PURPLE_ICON_SCALE_DISPLAY |
@@ -1072,7 +1061,6 @@ ggp_protocol_client_iface_init(PurplePro
 static void
 ggp_protocol_server_iface_init(PurpleProtocolServerIface *server_iface)
 {
-	server_iface->register_user  = ggp_account_register;
 	server_iface->get_info       = ggp_pubdir_get_info_protocol;
 	server_iface->set_status     = ggp_status_set_purplestatus;
 	server_iface->add_buddy      = ggp_add_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);