/soc/2013/ankitkv/gobjectification: 94a965c18f01: Renamed get_cb...
Ankit Vani
a at nevitus.org
Sat Sep 14 05:49:39 EDT 2013
Changeset: 94a965c18f01d069796f8dad0764319cefaa15b0
Author: Ankit Vani <a at nevitus.org>
Date: 2013-09-14 00:40 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/94a965c18f01
Description:
Renamed get_cb_real_name to get_cuser_real_name
diffstat:
finch/gntconv.c | 3 +-
libpurple/protocol.c | 10 ++++----
libpurple/protocol.h | 10 ++++----
libpurple/protocols/jabber/jabber.c | 2 +-
libpurple/protocols/zephyr/zephyr.c | 42 ++++++++++++++++++------------------
pidgin/gtkconv.c | 6 ++--
pidgin/gtkutils.c | 2 +-
7 files changed, 38 insertions(+), 37 deletions(-)
diffs (167 lines):
diff --git a/finch/gntconv.c b/finch/gntconv.c
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -706,7 +706,8 @@ create_conv_from_userlist(GntWidget *wid
protocol = purple_connection_get_protocol(gc);
if (protocol)
- realname = purple_protocol_iface_get_cb_real_name(protocol, gc, purple_chat_conversation_get_id(
+ realname = purple_protocol_iface_get_cuser_real_name(protocol, gc,
+ purple_chat_conversation_get_id(
PURPLE_CHAT_CONVERSATION(fc->active_conv)), name);
purple_im_conversation_new(account, realname ? realname : name);
diff --git a/libpurple/protocol.c b/libpurple/protocol.c
--- a/libpurple/protocol.c
+++ b/libpurple/protocol.c
@@ -586,12 +586,12 @@ purple_protocol_iface_remove_group(Purpl
}
char *
-purple_protocol_iface_get_cb_real_name(PurpleProtocol *protocol,
- PurpleConnection *gc, int id,
- const char *who)
+purple_protocol_iface_get_cuser_real_name(PurpleProtocol *protocol,
+ PurpleConnection *gc, int id,
+ const char *who)
{
- DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, get_cb_real_name, gc, id,
- who);
+ DEFINE_PROTOCOL_FUNC_WITH_RETURN(protocol, NULL, get_cuser_real_name, gc,
+ id, who);
}
void
diff --git a/libpurple/protocol.h b/libpurple/protocol.h
--- a/libpurple/protocol.h
+++ b/libpurple/protocol.h
@@ -408,7 +408,7 @@ struct _PurpleProtocolInterface
* @return the real name of the participant. This string must be
* freed by the caller.
*/
- char *(*get_cb_real_name)(PurpleConnection *gc, int id, const char *who);
+ char *(*get_cuser_real_name)(PurpleConnection *gc, int id, const char *who);
void (*set_chat_topic)(PurpleConnection *gc, int id, const char *topic);
@@ -834,10 +834,10 @@ void purple_protocol_iface_set_buddy_ico
void purple_protocol_iface_remove_group(PurpleProtocol *, PurpleConnection *gc,
PurpleGroup *group);
-/** @copydoc _PurpleProtocolInterface::get_cb_real_name */
-char *purple_protocol_iface_get_cb_real_name(PurpleProtocol *,
- PurpleConnection *gc, int id,
- const char *who);
+/** @copydoc _PurpleProtocolInterface::get_cuser_real_name */
+char *purple_protocol_iface_get_cuser_real_name(PurpleProtocol *,
+ PurpleConnection *gc, int id,
+ const char *who);
/** @copydoc _PurpleProtocolInterface::set_chat_topic */
void purple_protocol_iface_set_chat_topic(PurpleProtocol *,
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
@@ -4191,7 +4191,7 @@ jabber_protocol_interface_init(PurplePro
iface->convo_closed = jabber_convo_closed;
iface->normalize = jabber_normalize;
iface->set_buddy_icon = jabber_set_buddy_icon;
- iface->get_cb_real_name = jabber_chat_user_real_name;
+ iface->get_cuser_real_name = jabber_chat_user_real_name;
iface->set_chat_topic = jabber_chat_set_topic;
iface->find_blist_chat = jabber_find_blist_chat;
iface->roomlist_get_list = jabber_roomlist_get_list;
diff --git a/libpurple/protocols/zephyr/zephyr.c b/libpurple/protocols/zephyr/zephyr.c
--- a/libpurple/protocols/zephyr/zephyr.c
+++ b/libpurple/protocols/zephyr/zephyr.c
@@ -2937,27 +2937,27 @@ zephyr_protocol_class_init(PurpleProtoco
static void
zephyr_protocol_interface_init(PurpleProtocolInterface *iface)
{
- iface->get_actions = zephyr_get_actions;
- iface->list_icon = zephyr_list_icon;
- iface->status_types = zephyr_status_types;
- iface->chat_info = zephyr_chat_info;
- iface->login = zephyr_login;
- iface->close = zephyr_close;
- iface->send_im = zephyr_send_im;
- iface->send_typing = zephyr_send_typing;
- iface->get_info = zephyr_zloc;
- iface->set_status = zephyr_set_status;
- iface->join_chat = zephyr_join_chat;
- iface->get_chat_name = zephyr_get_chat_name;
- iface->chat_leave = zephyr_chat_leave;
- iface->chat_send = zephyr_chat_send;
- iface->normalize = zephyr_normalize;
- iface->set_chat_topic = zephyr_chat_set_topic;
- iface->find_blist_chat = zephyr_find_blist_chat;
-
- iface->set_info = NULL; /* XXX Location? */
- iface->set_buddy_icon = NULL; /* XXX */
- iface->get_cb_real_name = NULL; /* XXX */
+ iface->get_actions = zephyr_get_actions;
+ iface->list_icon = zephyr_list_icon;
+ iface->status_types = zephyr_status_types;
+ iface->chat_info = zephyr_chat_info;
+ iface->login = zephyr_login;
+ iface->close = zephyr_close;
+ iface->send_im = zephyr_send_im;
+ iface->send_typing = zephyr_send_typing;
+ iface->get_info = zephyr_zloc;
+ iface->set_status = zephyr_set_status;
+ iface->join_chat = zephyr_join_chat;
+ iface->get_chat_name = zephyr_get_chat_name;
+ iface->chat_leave = zephyr_chat_leave;
+ iface->chat_send = zephyr_chat_send;
+ iface->normalize = zephyr_normalize;
+ iface->set_chat_topic = zephyr_chat_set_topic;
+ iface->find_blist_chat = zephyr_find_blist_chat;
+
+ iface->set_info = NULL; /* XXX Location? */
+ iface->set_buddy_icon = NULL; /* XXX */
+ iface->get_cuser_real_name = NULL; /* XXX */
}
diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c
--- a/pidgin/gtkconv.c
+++ b/pidgin/gtkconv.c
@@ -1487,7 +1487,7 @@ chat_do_im(PidginConversation *gtkconv,
protocol = purple_connection_get_protocol(gc);
if (protocol)
- real_who = purple_protocol_iface_get_cb_real_name(protocol, gc,
+ real_who = purple_protocol_iface_get_cuser_real_name(protocol, gc,
purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv)), who);
if(!who && !real_who)
@@ -1541,7 +1541,7 @@ menu_chat_send_file_cb(GtkWidget *w, Pid
protocol = purple_connection_get_protocol(gc);
if (protocol)
- real_who = purple_protocol_iface_get_cb_real_name(protocol, gc,
+ real_who = purple_protocol_iface_get_cuser_real_name(protocol, gc,
purple_chat_conversation_get_id(PURPLE_CHAT_CONVERSATION(conv)), who);
serv_send_file(gc, real_who ? real_who : who, NULL);
@@ -1673,7 +1673,7 @@ create_chat_menu(PurpleChatConversation
can_receive_file = FALSE;
else {
gchar *real_who = NULL;
- real_who = purple_protocol_iface_get_cb_real_name(protocol, gc,
+ real_who = purple_protocol_iface_get_cuser_real_name(protocol, gc,
purple_chat_conversation_get_id(chat), who);
if (!(!PURPLE_PROTOCOL_IMPLEMENTS(protocol, can_receive_file) ||
purple_protocol_iface_can_receive_file(protocol, gc, real_who ? real_who : who)))
diff --git a/pidgin/gtkutils.c b/pidgin/gtkutils.c
--- a/pidgin/gtkutils.c
+++ b/pidgin/gtkutils.c
@@ -921,7 +921,7 @@ void pidgin_retrieve_user_info_in_chat(P
protocol = purple_connection_get_protocol(conn);
if (protocol != NULL)
- who = purple_protocol_iface_get_cb_real_name(protocol, conn, chat, name);
+ who = purple_protocol_iface_get_cuser_real_name(protocol, conn, chat, name);
pidgin_retrieve_user_info(conn, who ? who : name);
g_free(who);
More information about the Commits
mailing list