/soc/2013/ankitkv/gobjectification: 7f9fac14ed60: Temporarily re...
Ankit Vani
a at nevitus.org
Sun Sep 15 10:14:02 EDT 2013
Changeset: 7f9fac14ed6067c39c8f1ca7a7b1e9e57a6b6dc8
Author: Ankit Vani <a at nevitus.org>
Date: 2013-09-15 13:14 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/7f9fac14ed60
Description:
Temporarily replaced PurpleProtocolInterface with PurpleProtocolClientIface in protocols
diffstat:
libpurple/protocols/bonjour/bonjour.c | 42 ++++++------
libpurple/protocols/gg/gg.c | 70 ++++++++++----------
libpurple/protocols/irc/irc.c | 58 ++++++++--------
libpurple/protocols/jabber/facebook.c | 42 ++++++------
libpurple/protocols/jabber/gtalk.c | 12 +-
libpurple/protocols/jabber/jabber.c | 108 ++++++++++++++++----------------
libpurple/protocols/msn/msn.c | 90 +++++++++++++-------------
libpurple/protocols/mxit/mxit.c | 84 ++++++++++++------------
libpurple/protocols/myspace/myspace.c | 54 ++++++++--------
libpurple/protocols/novell/novell.c | 66 +++++++++---------
libpurple/protocols/null/nullprotocol.c | 84 ++++++++++++------------
libpurple/protocols/oscar/aim.c | 16 ++--
libpurple/protocols/oscar/icq.c | 14 ++--
libpurple/protocols/oscar/oscar.c | 82 ++++++++++++------------
libpurple/protocols/sametime/sametime.c | 90 +++++++++++++-------------
libpurple/protocols/silc/silc.c | 66 +++++++++---------
libpurple/protocols/simple/simple.c | 28 ++++----
libpurple/protocols/yahoo/yahoo.c | 92 +++++++++++++-------------
libpurple/protocols/yahoo/yahoojp.c | 8 +-
libpurple/protocols/zephyr/zephyr.c | 48 +++++++-------
20 files changed, 577 insertions(+), 577 deletions(-)
diffs (truncated from 1473 to 300 lines):
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
@@ -667,32 +667,32 @@ bonjour_protocol_class_init(PurpleProtoc
}
static void
-bonjour_protocol_interface_init(PurpleProtocolInterface *iface)
+bonjour_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
{
- iface->list_icon = bonjour_list_icon;
- iface->status_text = bonjour_status_text;
- iface->tooltip_text = bonjour_tooltip_text;
- iface->status_types = bonjour_status_types;
- iface->login = bonjour_login;
- iface->close = bonjour_close;
- iface->send_im = bonjour_send_im;
- iface->set_status = bonjour_set_status;
- iface->add_buddy = bonjour_fake_add_buddy;
- iface->remove_buddy = bonjour_remove_buddy;
- iface->group_buddy = bonjour_group_buddy;
- iface->rename_group = bonjour_rename_group;
- iface->convo_closed = bonjour_convo_closed;
- iface->set_buddy_icon = bonjour_set_buddy_icon;
- iface->can_receive_file = bonjour_can_receive_file;
- iface->send_file = bonjour_send_file;
- iface->new_xfer = bonjour_new_xfer;
- iface->get_max_message_size = bonjour_get_max_message_size;
+ client_iface->list_icon = bonjour_list_icon;
+ client_iface->status_text = bonjour_status_text;
+ client_iface->tooltip_text = bonjour_tooltip_text;
+ client_iface->status_types = bonjour_status_types;
+ client_iface->login = bonjour_login;
+ client_iface->close = bonjour_close;
+ client_iface->send_im = bonjour_send_im;
+ client_iface->set_status = bonjour_set_status;
+ client_iface->add_buddy = bonjour_fake_add_buddy;
+ client_iface->remove_buddy = bonjour_remove_buddy;
+ client_iface->group_buddy = bonjour_group_buddy;
+ client_iface->rename_group = bonjour_rename_group;
+ client_iface->convo_closed = bonjour_convo_closed;
+ client_iface->set_buddy_icon = bonjour_set_buddy_icon;
+ client_iface->can_receive_file = bonjour_can_receive_file;
+ client_iface->send_file = bonjour_send_file;
+ client_iface->new_xfer = bonjour_new_xfer;
+ client_iface->get_max_message_size = bonjour_get_max_message_size;
}
PURPLE_DEFINE_TYPE_EXTENDED(
BonjourProtocol, bonjour_protocol, PURPLE_TYPE_PROTOCOL, 0,
- PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_INTERFACE,
- bonjour_protocol_interface_init)
+ PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CLIENT_IFACE,
+ bonjour_protocol_client_iface_init)
);
static PurplePluginInfo *
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
@@ -1448,46 +1448,46 @@ ggp_protocol_class_init(PurpleProtocolCl
}
static void
-ggp_protocol_interface_init(PurpleProtocolInterface *iface)
+ggp_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
{
- iface->get_actions = ggp_get_actions;
- iface->list_icon = ggp_list_icon;
- iface->list_emblem = ggp_list_emblem;
- iface->status_text = ggp_status_buddy_text;
- iface->tooltip_text = ggp_tooltip_text;
- iface->status_types = ggp_status_types;
- iface->blist_node_menu = ggp_blist_node_menu;
- iface->chat_info = ggp_chat_info;
- iface->login = ggp_login;
- iface->close = ggp_close;
- iface->send_im = ggp_send_im;
- iface->send_typing = ggp_send_typing;
- iface->get_info = ggp_pubdir_get_info_protocol;
- iface->set_status = ggp_status_set_purplestatus;
- iface->add_buddy = ggp_add_buddy;
- iface->remove_buddy = ggp_remove_buddy;
- iface->add_deny = ggp_add_deny;
- iface->rem_deny = ggp_rem_deny;
- iface->join_chat = ggp_join_chat;
- iface->get_chat_name = ggp_get_chat_name;
- iface->chat_send = ggp_chat_send;
- iface->keepalive = ggp_keepalive;
- iface->register_user = ggp_account_register;
- iface->alias_buddy = ggp_roster_alias_buddy;
- iface->group_buddy = ggp_roster_group_buddy;
- iface->rename_group = ggp_roster_rename_group;
- iface->buddy_free = ggp_buddy_free;
- iface->normalize = ggp_normalize;
- iface->set_buddy_icon = ggp_avatar_own_set;
- iface->offline_message = ggp_offline_message;
- iface->get_account_text_table = ggp_get_account_text_table;
- iface->get_max_message_size = ggp_get_max_message_size;
+ client_iface->get_actions = ggp_get_actions;
+ client_iface->list_icon = ggp_list_icon;
+ client_iface->list_emblem = ggp_list_emblem;
+ client_iface->status_text = ggp_status_buddy_text;
+ client_iface->tooltip_text = ggp_tooltip_text;
+ client_iface->status_types = ggp_status_types;
+ client_iface->blist_node_menu = ggp_blist_node_menu;
+ client_iface->chat_info = ggp_chat_info;
+ client_iface->login = ggp_login;
+ client_iface->close = ggp_close;
+ client_iface->send_im = ggp_send_im;
+ client_iface->send_typing = ggp_send_typing;
+ client_iface->get_info = ggp_pubdir_get_info_protocol;
+ client_iface->set_status = ggp_status_set_purplestatus;
+ client_iface->add_buddy = ggp_add_buddy;
+ client_iface->remove_buddy = ggp_remove_buddy;
+ client_iface->add_deny = ggp_add_deny;
+ client_iface->rem_deny = ggp_rem_deny;
+ client_iface->join_chat = ggp_join_chat;
+ client_iface->get_chat_name = ggp_get_chat_name;
+ client_iface->chat_send = ggp_chat_send;
+ client_iface->keepalive = ggp_keepalive;
+ client_iface->register_user = ggp_account_register;
+ client_iface->alias_buddy = ggp_roster_alias_buddy;
+ client_iface->group_buddy = ggp_roster_group_buddy;
+ client_iface->rename_group = ggp_roster_rename_group;
+ client_iface->buddy_free = ggp_buddy_free;
+ client_iface->normalize = ggp_normalize;
+ client_iface->set_buddy_icon = ggp_avatar_own_set;
+ client_iface->offline_message = ggp_offline_message;
+ client_iface->get_account_text_table = ggp_get_account_text_table;
+ client_iface->get_max_message_size = ggp_get_max_message_size;
}
PURPLE_DEFINE_TYPE_EXTENDED(
GGPProtocol, ggp_protocol, PURPLE_TYPE_PROTOCOL, 0,
- PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_INTERFACE,
- ggp_protocol_interface_init)
+ PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CLIENT_IFACE,
+ ggp_protocol_client_iface_init)
);
static PurplePluginInfo *
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
@@ -977,40 +977,40 @@ irc_protocol_class_init(PurpleProtocolCl
}
static void
-irc_protocol_interface_init(PurpleProtocolInterface *iface)
+irc_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
{
- iface->get_actions = irc_get_actions;
- iface->list_icon = irc_blist_icon;
- iface->status_types = irc_status_types;
- iface->chat_info = irc_chat_join_info;
- iface->chat_info_defaults = irc_chat_info_defaults;
- iface->login = irc_login;
- iface->close = irc_close;
- iface->send_im = irc_im_send;
- iface->get_info = irc_get_info;
- iface->set_status = irc_set_status;
- iface->add_buddy = irc_add_buddy;
- iface->remove_buddy = irc_remove_buddy;
- iface->join_chat = irc_chat_join;
- iface->get_chat_name = irc_get_chat_name;
- iface->chat_invite = irc_chat_invite;
- iface->chat_leave = irc_chat_leave;
- iface->chat_send = irc_chat_send;
- iface->keepalive = irc_keepalive;
- iface->normalize = purple_normalize_nocase;
- iface->set_chat_topic = irc_chat_set_topic;
- iface->roomlist_get_list = irc_roomlist_get_list;
- iface->roomlist_cancel = irc_roomlist_cancel;
- iface->send_file = irc_dccsend_send_file;
- iface->new_xfer = irc_dccsend_new_xfer;
- iface->send_raw = irc_send_raw;
- iface->get_max_message_size = irc_get_max_message_size;
+ client_iface->get_actions = irc_get_actions;
+ client_iface->list_icon = irc_blist_icon;
+ client_iface->status_types = irc_status_types;
+ client_iface->chat_info = irc_chat_join_info;
+ client_iface->chat_info_defaults = irc_chat_info_defaults;
+ client_iface->login = irc_login;
+ client_iface->close = irc_close;
+ client_iface->send_im = irc_im_send;
+ client_iface->get_info = irc_get_info;
+ client_iface->set_status = irc_set_status;
+ client_iface->add_buddy = irc_add_buddy;
+ client_iface->remove_buddy = irc_remove_buddy;
+ client_iface->join_chat = irc_chat_join;
+ client_iface->get_chat_name = irc_get_chat_name;
+ client_iface->chat_invite = irc_chat_invite;
+ client_iface->chat_leave = irc_chat_leave;
+ client_iface->chat_send = irc_chat_send;
+ client_iface->keepalive = irc_keepalive;
+ client_iface->normalize = purple_normalize_nocase;
+ client_iface->set_chat_topic = irc_chat_set_topic;
+ client_iface->roomlist_get_list = irc_roomlist_get_list;
+ client_iface->roomlist_cancel = irc_roomlist_cancel;
+ client_iface->send_file = irc_dccsend_send_file;
+ client_iface->new_xfer = irc_dccsend_new_xfer;
+ client_iface->send_raw = irc_send_raw;
+ client_iface->get_max_message_size = irc_get_max_message_size;
}
PURPLE_DEFINE_TYPE_EXTENDED(
IRCProtocol, irc_protocol, PURPLE_TYPE_PROTOCOL, 0,
- PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_INTERFACE,
- irc_protocol_interface_init)
+ PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CLIENT_IFACE,
+ irc_protocol_client_iface_init)
);
static PurplePluginInfo *
diff --git a/libpurple/protocols/jabber/facebook.c b/libpurple/protocols/jabber/facebook.c
--- a/libpurple/protocols/jabber/facebook.c
+++ b/libpurple/protocols/jabber/facebook.c
@@ -107,32 +107,32 @@ facebook_protocol_class_init(PurpleProto
}
static void
-facebook_protocol_interface_init(PurpleProtocolInterface *iface)
+facebook_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
{
- iface->list_icon = facebook_list_icon;
+ client_iface->list_icon = facebook_list_icon;
/* disable xmpp functions not available for facebook */
- iface->add_buddy = NULL;
- iface->remove_buddy = NULL;
- iface->add_deny = NULL;
- iface->rem_deny = NULL;
- iface->register_user = NULL;
- iface->alias_buddy = NULL;
- iface->group_buddy = NULL;
- iface->rename_group = NULL;
- iface->can_receive_file = NULL;
- iface->send_file = NULL;
- iface->new_xfer = NULL;
- iface->unregister_user = NULL;
- iface->send_attention = NULL;
- iface->get_attention_types = NULL;
- iface->initiate_media = NULL;
- iface->get_media_caps = NULL;
- iface->get_moods = NULL;
+ client_iface->add_buddy = NULL;
+ client_iface->remove_buddy = NULL;
+ client_iface->add_deny = NULL;
+ client_iface->rem_deny = NULL;
+ client_iface->register_user = NULL;
+ client_iface->alias_buddy = NULL;
+ client_iface->group_buddy = NULL;
+ client_iface->rename_group = NULL;
+ client_iface->can_receive_file = NULL;
+ client_iface->send_file = NULL;
+ client_iface->new_xfer = NULL;
+ client_iface->unregister_user = NULL;
+ client_iface->send_attention = NULL;
+ client_iface->get_attention_types = NULL;
+ client_iface->initiate_media = NULL;
+ client_iface->get_media_caps = NULL;
+ client_iface->get_moods = NULL;
}
PURPLE_DEFINE_TYPE_EXTENDED(
FacebookProtocol, facebook_protocol, JABBER_TYPE_PROTOCOL, 0,
- PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_INTERFACE,
- facebook_protocol_interface_init)
+ PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CLIENT_IFACE,
+ facebook_protocol_client_iface_init)
);
diff --git a/libpurple/protocols/jabber/gtalk.c b/libpurple/protocols/jabber/gtalk.c
--- a/libpurple/protocols/jabber/gtalk.c
+++ b/libpurple/protocols/jabber/gtalk.c
@@ -115,17 +115,17 @@ gtalk_protocol_class_init(PurpleProtocol
}
static void
-gtalk_protocol_interface_init(PurpleProtocolInterface *iface)
+gtalk_protocol_client_iface_init(PurpleProtocolClientIface *client_iface)
{
- iface->list_icon = gtalk_list_icon;
+ client_iface->list_icon = gtalk_list_icon;
/* disable xmpp functions not available for gtalk */
- iface->register_user = NULL;
- iface->unregister_user = NULL;
+ client_iface->register_user = NULL;
+ client_iface->unregister_user = NULL;
}
PURPLE_DEFINE_TYPE_EXTENDED(
GTalkProtocol, gtalk_protocol, JABBER_TYPE_PROTOCOL, 0,
- PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_INTERFACE,
- gtalk_protocol_interface_init)
+ PURPLE_IMPLEMENT_INTERFACE_STATIC(PURPLE_TYPE_PROTOCOL_CLIENT_IFACE,
+ gtalk_protocol_client_iface_init)
);
diff --git a/libpurple/protocols/jabber/jabber.c b/libpurple/protocols/jabber/jabber.c
More information about the Commits
mailing list