/soc/2013/ankitkv/gobjectification: a0e5e2e8c219: Use PurplePlug...
Ankit Vani
a at nevitus.org
Sat Aug 10 20:04:50 EDT 2013
Changeset: a0e5e2e8c21952478f8aa85ca0db750e1310844a
Author: Ankit Vani <a at nevitus.org>
Date: 2013-08-11 05:34 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/a0e5e2e8c219
Description:
Use PurplePluginProtocolInfo instead of PurplePlugin as handles in jabber
diffstat:
libpurple/protocols/jabber/jabber.c | 54 ++++++++++++++++----------------
libpurple/protocols/jabber/jabber.h | 4 +-
libpurple/protocols/jabber/libfacebook.c | 4 +-
libpurple/protocols/jabber/libgtalk.c | 4 +-
libpurple/protocols/jabber/libxmpp.c | 4 +-
5 files changed, 35 insertions(+), 35 deletions(-)
diffs (243 lines):
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
--- a/libpurple/protocols/jabber/jabber.c
+++ b/libpurple/protocols/jabber/jabber.c
@@ -81,7 +81,7 @@
GList *jabber_features = NULL;
GList *jabber_identities = NULL;
-static GHashTable *jabber_cmds = NULL; /* PurplePlugin * => GSList of ids */
+static GHashTable *jabber_cmds = NULL; /* PurplePluginProtocolInfo * => GSList of ids */
static gint plugin_ref = 0;
@@ -3596,7 +3596,7 @@ jabber_cmd_mood(PurpleConversation *conv
}
}
-static void jabber_register_commands(PurplePlugin *plugin)
+static void jabber_register_commands(PurplePluginProtocolInfo *prpl_info)
{
GSList *commands = NULL;
PurpleCmdId id;
@@ -3718,7 +3718,7 @@ static void jabber_register_commands(Pur
_("mood <mood> [text]: Set current user mood"), NULL);
commands = g_slist_prepend(commands, GUINT_TO_POINTER(id));
- g_hash_table_insert(jabber_cmds, plugin, commands);
+ g_hash_table_insert(jabber_cmds, prpl_info, commands);
}
static void cmds_free_func(gpointer value)
@@ -3730,9 +3730,9 @@ static void cmds_free_func(gpointer valu
}
}
-static void jabber_unregister_commands(PurplePlugin *plugin)
+static void jabber_unregister_commands(PurplePluginProtocolInfo *prpl_info)
{
- g_hash_table_remove(jabber_cmds, plugin);
+ g_hash_table_remove(jabber_cmds, prpl_info);
}
#if 0
@@ -3932,14 +3932,14 @@ jabber_do_uninit(void)
jabber_cmds = NULL;
}
-void jabber_plugin_init(PurplePlugin *plugin)
+void jabber_plugin_init(PurplePluginProtocolInfo *prpl_info)
{
++plugin_ref;
if (plugin_ref == 1)
jabber_do_init();
- jabber_register_commands(plugin);
+ jabber_register_commands(prpl_info);
#if 0
/* IPC functions */
@@ -3967,30 +3967,30 @@ void jabber_plugin_init(PurplePlugin *pl
G_TYPE_STRING); /* namespace */
#endif
- purple_signal_register(plugin, "jabber-register-namespace-watcher",
+ purple_signal_register(prpl_info, "jabber-register-namespace-watcher",
purple_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE, 2,
G_TYPE_STRING, /* node */
G_TYPE_STRING); /* namespace */
- purple_signal_register(plugin, "jabber-unregister-namespace-watcher",
+ purple_signal_register(prpl_info, "jabber-unregister-namespace-watcher",
purple_marshal_VOID__POINTER_POINTER,
G_TYPE_NONE, 2,
G_TYPE_STRING, /* node */
G_TYPE_STRING); /* namespace */
- purple_signal_connect(plugin, "jabber-register-namespace-watcher",
- plugin, PURPLE_CALLBACK(jabber_iq_signal_register), NULL);
- purple_signal_connect(plugin, "jabber-unregister-namespace-watcher",
- plugin, PURPLE_CALLBACK(jabber_iq_signal_unregister), NULL);
-
-
- purple_signal_register(plugin, "jabber-receiving-xmlnode",
+ purple_signal_connect(prpl_info, "jabber-register-namespace-watcher",
+ prpl_info, PURPLE_CALLBACK(jabber_iq_signal_register), NULL);
+ purple_signal_connect(prpl_info, "jabber-unregister-namespace-watcher",
+ prpl_info, PURPLE_CALLBACK(jabber_iq_signal_unregister), NULL);
+
+
+ purple_signal_register(prpl_info, "jabber-receiving-xmlnode",
purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
PURPLE_TYPE_CONNECTION,
G_TYPE_POINTER); /* modifiable xmlnode */
- purple_signal_register(plugin, "jabber-sending-xmlnode",
+ purple_signal_register(prpl_info, "jabber-sending-xmlnode",
purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
PURPLE_TYPE_CONNECTION,
G_TYPE_POINTER); /* modifiable xmlnode */
@@ -3999,16 +3999,16 @@ void jabber_plugin_init(PurplePlugin *pl
* Do not remove this or the plugin will fail. Completely. You have been
* warned!
*/
- purple_signal_connect_priority(plugin, "jabber-sending-xmlnode",
- plugin, PURPLE_CALLBACK(jabber_send_signal_cb),
+ purple_signal_connect_priority(prpl_info, "jabber-sending-xmlnode",
+ prpl_info, PURPLE_CALLBACK(jabber_send_signal_cb),
NULL, PURPLE_SIGNAL_PRIORITY_HIGHEST);
- purple_signal_register(plugin, "jabber-sending-text",
+ purple_signal_register(prpl_info, "jabber-sending-text",
purple_marshal_VOID__POINTER_POINTER, G_TYPE_NONE, 2,
PURPLE_TYPE_CONNECTION,
G_TYPE_POINTER); /* pointer to a string */
- purple_signal_register(plugin, "jabber-receiving-message",
+ purple_signal_register(prpl_info, "jabber-receiving-message",
purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER_POINTER,
G_TYPE_BOOLEAN, 6,
PURPLE_TYPE_CONNECTION,
@@ -4018,7 +4018,7 @@ void jabber_plugin_init(PurplePlugin *pl
G_TYPE_STRING, /* to */
PURPLE_TYPE_XMLNODE);
- purple_signal_register(plugin, "jabber-receiving-iq",
+ purple_signal_register(prpl_info, "jabber-receiving-iq",
purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,
G_TYPE_BOOLEAN, 5,
PURPLE_TYPE_CONNECTION,
@@ -4027,7 +4027,7 @@ void jabber_plugin_init(PurplePlugin *pl
G_TYPE_STRING, /* from */
PURPLE_TYPE_XMLNODE);
- purple_signal_register(plugin, "jabber-watched-iq",
+ purple_signal_register(prpl_info, "jabber-watched-iq",
purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER_POINTER,
G_TYPE_BOOLEAN, 5,
PURPLE_TYPE_CONNECTION,
@@ -4036,7 +4036,7 @@ void jabber_plugin_init(PurplePlugin *pl
G_TYPE_STRING, /* from */
PURPLE_TYPE_XMLNODE); /* child */
- purple_signal_register(plugin, "jabber-receiving-presence",
+ purple_signal_register(prpl_info, "jabber-receiving-presence",
purple_marshal_BOOLEAN__POINTER_POINTER_POINTER_POINTER,
G_TYPE_BOOLEAN, 4,
PURPLE_TYPE_CONNECTION,
@@ -4045,15 +4045,15 @@ void jabber_plugin_init(PurplePlugin *pl
PURPLE_TYPE_XMLNODE);
}
-void jabber_plugin_uninit(PurplePlugin *plugin)
+void jabber_plugin_uninit(PurplePluginProtocolInfo *prpl_info)
{
g_return_if_fail(plugin_ref > 0);
- purple_signals_unregister_by_instance(plugin);
+ purple_signals_unregister_by_instance(prpl_info);
#if 0
purple_plugin_ipc_unregister_all(plugin);
#endif
- jabber_unregister_commands(plugin);
+ jabber_unregister_commands(prpl_info);
--plugin_ref;
if (plugin_ref == 0)
diff --git a/libpurple/protocols/jabber/jabber.h b/libpurple/protocols/jabber/jabber.h
--- a/libpurple/protocols/jabber/jabber.h
+++ b/libpurple/protocols/jabber/jabber.h
@@ -412,7 +412,7 @@ gboolean jabber_initiate_media(PurpleAcc
PurpleMediaCaps jabber_get_media_caps(PurpleAccount *account, const char *who);
gboolean jabber_can_receive_file(PurpleConnection *gc, const gchar *who);
-void jabber_plugin_init(PurplePlugin *plugin);
-void jabber_plugin_uninit(PurplePlugin *plugin);
+void jabber_plugin_init(PurplePluginProtocolInfo *prpl_info);
+void jabber_plugin_uninit(PurplePluginProtocolInfo *prpl_info);
#endif /* PURPLE_JABBER_H_ */
diff --git a/libpurple/protocols/jabber/libfacebook.c b/libpurple/protocols/jabber/libfacebook.c
--- a/libpurple/protocols/jabber/libfacebook.c
+++ b/libpurple/protocols/jabber/libfacebook.c
@@ -291,7 +291,7 @@ plugin_load(PurplePlugin *plugin, GError
PURPLE_CALLBACK(xmpp_uri_handler), NULL);
purple_protocols_add(my_protocol);
- jabber_plugin_init(plugin);
+ jabber_plugin_init(my_protocol);
return TRUE;
}
@@ -299,7 +299,7 @@ plugin_load(PurplePlugin *plugin, GError
static gboolean
plugin_unload(PurplePlugin *plugin, GError **error)
{
- jabber_plugin_uninit(plugin);
+ jabber_plugin_uninit(my_protocol);
purple_protocols_remove(my_protocol);
return TRUE;
diff --git a/libpurple/protocols/jabber/libgtalk.c b/libpurple/protocols/jabber/libgtalk.c
--- a/libpurple/protocols/jabber/libgtalk.c
+++ b/libpurple/protocols/jabber/libgtalk.c
@@ -299,7 +299,7 @@ plugin_load(PurplePlugin *plugin, GError
PURPLE_CALLBACK(xmpp_uri_handler), NULL);
purple_protocols_add(my_protocol);
- jabber_plugin_init(plugin);
+ jabber_plugin_init(my_protocol);
return TRUE;
}
@@ -307,7 +307,7 @@ plugin_load(PurplePlugin *plugin, GError
static gboolean
plugin_unload(PurplePlugin *plugin, GError **error)
{
- jabber_plugin_uninit(plugin);
+ jabber_plugin_uninit(my_protocol);
purple_protocols_remove(my_protocol);
return TRUE;
diff --git a/libpurple/protocols/jabber/libxmpp.c b/libpurple/protocols/jabber/libxmpp.c
--- a/libpurple/protocols/jabber/libxmpp.c
+++ b/libpurple/protocols/jabber/libxmpp.c
@@ -295,7 +295,7 @@ plugin_load(PurplePlugin *plugin, GError
PURPLE_CALLBACK(xmpp_uri_handler), NULL);
purple_protocols_add(my_protocol);
- jabber_plugin_init(plugin);
+ jabber_plugin_init(my_protocol);
return TRUE;
}
@@ -303,7 +303,7 @@ plugin_load(PurplePlugin *plugin, GError
static gboolean
plugin_unload(PurplePlugin *plugin, GError **error)
{
- jabber_plugin_uninit(plugin);
+ jabber_plugin_uninit(my_protocol);
purple_protocols_remove(my_protocol);
return TRUE;
More information about the Commits
mailing list