/soc/2013/ankitkv/gobjectification: 38de3f22e864: Renamed close_...

[Ankit Vani]

Changeset: 38de3f22e864de408c33a49aec824eb41f30a089
Author:	 Ankit Vani <a at nevitus.org>
Date:	 2013-09-15 19:14 +0530
Branch:	 soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/38de3f22e864

Description:

Renamed close_connection back to close

diffstat:

 libpurple/connection.c                  |  2 +-
 libpurple/protocol.c                    |  5 ++---
 libpurple/protocol.h                    |  7 +++----
 libpurple/protocols.c                   |  4 ++--
 libpurple/protocols/bonjour/bonjour.c   |  8 ++++----
 libpurple/protocols/gg/gg.c             |  8 ++++----
 libpurple/protocols/irc/irc.c           |  8 ++++----
 libpurple/protocols/null/nullprotocol.c |  8 ++++----
 8 files changed, 24 insertions(+), 26 deletions(-)

diffs (138 lines):

diff --git a/libpurple/connection.c b/libpurple/connection.c
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -732,7 +732,7 @@ purple_connection_dispose(GObject *objec
 	purple_http_conn_cancel_all(gc);
 	purple_proxy_connect_cancel_with_handle(gc);
 
-	purple_protocol_class_close_connection(priv->protocol, gc);
+	purple_protocol_class_close(priv->protocol, gc);
 
 	/* Clear out the proto data that was freed in the protocol's close method */
 	buddies = purple_blist_find_buddies(account, NULL);
diff --git a/libpurple/protocol.c b/libpurple/protocol.c
--- a/libpurple/protocol.c
+++ b/libpurple/protocol.c
@@ -242,10 +242,9 @@ purple_protocol_class_login(PurpleProtoc
 }
 
 void
-purple_protocol_class_close_connection(PurpleProtocol *protocol,
-		PurpleConnection *gc)
+purple_protocol_class_close(PurpleProtocol *protocol, PurpleConnection *gc)
 {
-	DEFINE_PROTOCOL_FUNC(protocol, close_connection, gc);
+	DEFINE_PROTOCOL_FUNC(protocol, close, gc);
 }
 
 GList *
diff --git a/libpurple/protocol.h b/libpurple/protocol.h
--- a/libpurple/protocol.h
+++ b/libpurple/protocol.h
@@ -113,7 +113,7 @@ struct _PurpleProtocolClass
 	/**
 	 * Close connection with the server.
 	 */
-	void (*close_connection)(PurpleConnection *);
+	void (*close)(PurpleConnection *);
 
 	/**
 	 * Returns a list of #PurpleStatusType which exist for this account;
@@ -845,9 +845,8 @@ void purple_protocol_override(PurpleProt
 /** @copydoc  _PurpleProtocolClass::login */
 void purple_protocol_class_login(PurpleProtocol *, PurpleAccount *);
 
-/** @copydoc  _PurpleProtocolClass::close_connection */
-void purple_protocol_class_close_connection(PurpleProtocol *,
-		PurpleConnection *);
+/** @copydoc  _PurpleProtocolClass::close */
+void purple_protocol_class_close(PurpleProtocol *, PurpleConnection *);
 
 /** @copydoc  _PurpleProtocolClass::status_types */
 GList *purple_protocol_class_status_types(PurpleProtocol *,
diff --git a/libpurple/protocols.c b/libpurple/protocols.c
--- a/libpurple/protocols.c
+++ b/libpurple/protocols.c
@@ -823,8 +823,8 @@ purple_protocols_add(GType protocol_type
 	}
 
 	/* Make sure the protocol implements the required functions */
-	if (!klass->login        || !klass->close_connection ||
-	    !klass->status_types || !klass->list_icon)
+	if (!klass->login        || !klass->close    ||
+	    !klass->status_types || !klass->list_icon )
 	{
 		g_set_error(error, PURPLE_PROTOCOLS_DOMAIN, 0,
 		            _("Protocol %s does not implement all the functions in "
diff --git a/libpurple/protocols/bonjour/bonjour.c b/libpurple/protocols/bonjour/bonjour.c
--- a/libpurple/protocols/bonjour/bonjour.c
+++ b/libpurple/protocols/bonjour/bonjour.c
@@ -664,10 +664,10 @@ bonjour_protocol_init(PurpleProtocol *pr
 static void
 bonjour_protocol_class_init(PurpleProtocolClass *klass)
 {
-	klass->login            = bonjour_login;
-	klass->close_connection = bonjour_close;
-	klass->status_types     = bonjour_status_types;
-	klass->list_icon        = bonjour_list_icon;
+	klass->login        = bonjour_login;
+	klass->close        = bonjour_close;
+	klass->status_types = bonjour_status_types;
+	klass->list_icon    = bonjour_list_icon;
 }
 
 static void
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
@@ -1445,10 +1445,10 @@ ggp_protocol_init(PurpleProtocol *protoc
 static void
 ggp_protocol_class_init(PurpleProtocolClass *klass)
 {
-	klass->login            = ggp_login;
-	klass->close_connection = ggp_close;
-	klass->status_types     = ggp_status_types;
-	klass->list_icon        = ggp_list_icon;
+	klass->login        = ggp_login;
+	klass->close        = ggp_close;
+	klass->status_types = ggp_status_types;
+	klass->list_icon    = ggp_list_icon;
 }
 
 static void
diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -974,10 +974,10 @@ irc_protocol_init(PurpleProtocol *protoc
 static void
 irc_protocol_class_init(PurpleProtocolClass *klass)
 {
-	klass->login            = irc_login;
-	klass->close_connection = irc_close;
-	klass->status_types     = irc_status_types;
-	klass->list_icon        = irc_blist_icon;
+	klass->login        = irc_login;
+	klass->close        = irc_close;
+	klass->status_types = irc_status_types;
+	klass->list_icon    = irc_blist_icon;
 }
 
 static void
diff --git a/libpurple/protocols/null/nullprotocol.c b/libpurple/protocols/null/nullprotocol.c
--- a/libpurple/protocols/null/nullprotocol.c
+++ b/libpurple/protocols/null/nullprotocol.c
@@ -1087,10 +1087,10 @@ null_protocol_init(PurpleProtocol *proto
 static void
 null_protocol_class_init(PurpleProtocolClass *klass)
 {
-  klass->login            = null_login;
-  klass->close_connection = null_close;
-  klass->status_types     = null_status_types;
-  klass->list_icon        = null_list_icon;
+  klass->login        = null_login;
+  klass->close        = null_close;
+  klass->status_types = null_status_types;
+  klass->list_icon    = null_list_icon;
 }
 
 static void