/soc/2013/ankitkv/gobjectification: 8ba9a23354ff: Merge gtkdoc-c...
Ankit Vani
a at nevitus.org
Sun Feb 9 14:42:58 EST 2014
Changeset: 8ba9a23354ff80cbadfb48e66602607e90b45cb8
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-10 01:09 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/8ba9a23354ff
Description:
Merge gtkdoc-conversion
diffstat:
ChangeLog.API | 4 +
finch/gntblist.c | 14 ++--
finch/gntconv.c | 8 +-
finch/gntpounce.c | 2 +-
libpurple/account.c | 14 ++--
libpurple/buddylist.c | 4 +-
libpurple/connection.c | 2 +-
libpurple/conversation.c | 4 +-
libpurple/conversationtypes.c | 22 +++---
libpurple/conversationtypes.h | 2 +-
libpurple/core.c | 2 +-
libpurple/dbus-bindings.h | 6 +-
libpurple/dbus-purple.h | 6 +-
libpurple/dbus-server.c | 24 ++++----
libpurple/internal.h | 4 +-
libpurple/network.c | 2 +-
libpurple/plugins/filectl.c | 2 +-
libpurple/plugins/perl/common/Server.xs | 58 +++++++++---------
libpurple/plugins/tcl/tcl_cmds.c | 6 +-
libpurple/protocol.h | 6 +-
libpurple/protocols.c | 6 +-
libpurple/protocols/bonjour/buddy.c | 4 +-
libpurple/protocols/bonjour/jabber.c | 2 +-
libpurple/protocols/gg/chat.c | 8 +-
libpurple/protocols/gg/gg.c | 4 +-
libpurple/protocols/gg/message-prpl.c | 2 +-
libpurple/protocols/gg/pubdir-prpl.c | 2 +-
libpurple/protocols/irc/cmds.c | 2 +-
libpurple/protocols/irc/irc.c | 4 +-
libpurple/protocols/irc/msgs.c | 14 ++--
libpurple/protocols/jabber/buddy.c | 4 +-
libpurple/protocols/jabber/message.c | 14 ++--
libpurple/protocols/jabber/presence.c | 10 +-
libpurple/protocols/jabber/roster.c | 2 +-
libpurple/protocols/jabber/usernick.c | 2 +-
libpurple/protocols/msn/msg.c | 14 ++--
libpurple/protocols/msn/msn.c | 10 +-
libpurple/protocols/msn/notification.c | 2 +-
libpurple/protocols/msn/oim.c | 2 +-
libpurple/protocols/msn/switchboard.c | 8 +-
libpurple/protocols/msn/user.c | 2 +-
libpurple/protocols/msn/userlist.c | 2 +-
libpurple/protocols/mxit/client.c | 6 +-
libpurple/protocols/mxit/markup.c | 6 +-
libpurple/protocols/mxit/multimx.c | 12 ++--
libpurple/protocols/mxit/mxit.c | 2 +-
libpurple/protocols/myspace/myspace.c | 14 ++--
libpurple/protocols/novell/novell.c | 20 +++---
libpurple/protocols/null/nullprpl.c | 16 ++--
libpurple/protocols/oscar/family_icq.c | 2 +-
libpurple/protocols/oscar/odc.c | 8 +-
libpurple/protocols/oscar/oscar.c | 36 ++++++------
libpurple/protocols/sametime/sametime.c | 22 +++---
libpurple/protocols/silc/chat.c | 12 ++--
libpurple/protocols/silc/ops.c | 20 +++---
libpurple/protocols/simple/simple.c | 8 +-
libpurple/protocols/yahoo/yahoo.c | 2 +-
libpurple/protocols/yahoo/yahoo_aliases.c | 4 +-
libpurple/protocols/yahoo/yahoochat.c | 22 +++---
libpurple/protocols/yahoo/ycht.c | 6 +-
libpurple/protocols/yahoo/ymsg.c | 14 ++--
libpurple/protocols/zephyr/zephyr.c | 14 ++--
libpurple/purple-client.c | 6 +-
libpurple/roomlist.c | 2 +-
libpurple/server.c | 62 ++++++++++----------
libpurple/server.h | 78 +++++++++++++-------------
libpurple/stun.c | 6 +-
libpurple/stun.h | 4 +-
libpurple/theme-manager.c | 4 +-
libpurple/theme-manager.h | 6 +-
libpurple/upnp.c | 24 ++++----
libpurple/upnp.h | 8 +-
libpurple/xfer.c | 2 +-
pidgin/gtkblist.c | 10 +-
pidgin/gtkconv.c | 14 ++--
pidgin/gtkdialogs.c | 2 +-
pidgin/gtkpounce.c | 2 +-
pidgin/gtkprivacy.c | 2 +-
pidgin/gtkutils.c | 6 +-
pidgin/libpidgin.c | 4 +-
pidgin/plugins/musicmessaging/musicmessaging.c | 8 +-
81 files changed, 406 insertions(+), 402 deletions(-)
diffs (truncated from 3409 to 300 lines):
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -338,6 +338,7 @@ version 3.0.0 (??/??/????):
purple_savedstatus_set_primitive_type
* purple_savedstatus_substatus_get_type renamed to
purple_savedstatus_substatus_get_status_type
+ * serv_* functions are now purple_serv_*
* purple_srv_resolve now takes a PurpleAccount as the first parameter
* purple_srv_txt_query_get_type renamed to
purple_srv_txt_query_get_query_type
@@ -349,8 +350,11 @@ version 3.0.0 (??/??/????):
the documentation for details.
* update_idle method has been added to PurplePresenceClass to update the
idle state of a presence
+ * StunCallback renamed to PurpleStunCallback
* purple_str_size_to_units now takes a goffset as the size parameter
+ * PTFunc renamed to PurpleThemeFunc
* purple_txt_resolve now takes a PurpleAccount as the first parameter
+ * UPnPMappingAddRemove renamed to PurpleUPnPMappingAddRemove
* purple_util_fetch_url_request now takes a PurpleAccount as
the first parameter
* purple_util_fetch_url_request now takes a length as the eighth
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -706,7 +706,7 @@ join_chat(PurpleChat *chat)
conv = purple_conversations_find_chat_with_account(name, account);
if (!conv || purple_chat_conversation_has_left(conv)) {
- serv_join_chat(purple_account_get_connection(account),
+ purple_serv_join_chat(purple_account_get_connection(account),
purple_chat_get_components(chat));
} else if (conv) {
purple_conversation_present(PURPLE_CONVERSATION(conv));
@@ -1211,7 +1211,7 @@ gpointer finch_retrieve_user_info(Purple
uihandle = purple_notify_userinfo(conn, name, info, NULL, NULL);
purple_notify_user_info_destroy(info);
- serv_get_info(conn, name);
+ purple_serv_get_info(conn, name);
return uihandle;
}
@@ -1224,7 +1224,7 @@ finch_blist_get_buddy_info_cb(PurpleBlis
static void
finch_blist_menu_send_file_cb(PurpleBlistNode *selected, PurpleBuddy *buddy)
{
- serv_send_file(purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy), NULL);
+ purple_serv_send_file(purple_account_get_connection(purple_buddy_get_account(buddy)), purple_buddy_get_name(buddy), NULL);
}
static void
@@ -1348,10 +1348,10 @@ rename_blist_node(PurpleBlistNode *node,
PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact);
purple_contact_set_alias(contact, name);
purple_buddy_set_local_alias(buddy, name);
- serv_alias_buddy(buddy);
+ purple_serv_alias_buddy(buddy);
} else if (PURPLE_IS_BUDDY(node)) {
purple_buddy_set_local_alias((PurpleBuddy*)node, name);
- serv_alias_buddy((PurpleBuddy*)node);
+ purple_serv_alias_buddy((PurpleBuddy*)node);
} else if (PURPLE_IS_CHAT(node))
purple_chat_set_alias((PurpleChat*)node, name);
else if (PURPLE_IS_GROUP(node) && (name != NULL))
@@ -2649,7 +2649,7 @@ auto_join_chats(gpointer data)
PurpleChat *chat = (PurpleChat*)node;
if (purple_chat_get_account(chat) == account &&
purple_blist_node_get_bool(node, "gnt-autojoin"))
- serv_join_chat(purple_account_get_connection(account), purple_chat_get_components(chat));
+ purple_serv_join_chat(purple_account_get_connection(account), purple_chat_get_components(chat));
}
}
return FALSE;
@@ -2810,7 +2810,7 @@ join_chat_select_cb(gpointer data, Purpl
} else {
hash = purple_chat_get_components(chat);
}
- serv_join_chat(gc, hash);
+ purple_serv_join_chat(gc, hash);
if (chat == NULL && hash != NULL)
g_hash_table_destroy(hash);
}
diff --git a/finch/gntconv.c b/finch/gntconv.c
--- a/finch/gntconv.c
+++ b/finch/gntconv.c
@@ -115,7 +115,7 @@ send_typing_notification(GntWidget *w, F
if (send || (purple_im_conversation_get_type_again(im) != 0 &&
time(NULL) > purple_im_conversation_get_type_again(im))) {
unsigned int timeout;
- timeout = serv_send_typing(purple_conversation_get_connection(conv),
+ timeout = purple_serv_send_typing(purple_conversation_get_connection(conv),
purple_conversation_get_name(conv),
PURPLE_IM_TYPING);
purple_im_conversation_set_type_again(im, timeout);
@@ -123,7 +123,7 @@ send_typing_notification(GntWidget *w, F
} else {
purple_im_conversation_stop_send_typed_timeout(im);
- serv_send_typing(purple_conversation_get_connection(conv),
+ purple_serv_send_typing(purple_conversation_get_connection(conv),
purple_conversation_get_name(conv),
PURPLE_IM_NOT_TYPING);
}
@@ -340,7 +340,7 @@ account_signed_on_off(PurpleConnection *
} else {
comps = purple_chat_get_components(chat);
}
- serv_join_chat(gc, comps);
+ purple_serv_join_chat(gc, comps);
if (chat == NULL && comps != NULL)
g_hash_table_destroy(comps);
}
@@ -419,7 +419,7 @@ static void
send_file_cb(GntMenuItem *item, gpointer ggconv)
{
FinchConv *ggc = ggconv;
- serv_send_file(purple_conversation_get_connection(ggc->active_conv),
+ purple_serv_send_file(purple_conversation_get_connection(ggc->active_conv),
purple_conversation_get_name(ggc->active_conv), NULL);
}
diff --git a/finch/gntpounce.c b/finch/gntpounce.c
--- a/finch/gntpounce.c
+++ b/finch/gntpounce.c
@@ -876,7 +876,7 @@ pounce_cb(PurplePounce *pounce, PurplePo
purple_conversation_write(PURPLE_CONVERSATION(im), NULL, message,
PURPLE_MESSAGE_SEND, time(NULL));
- serv_send_im(purple_account_get_connection(account), (char *)pouncee, (char *)message, 0);
+ purple_serv_send_im(purple_account_get_connection(account), (char *)pouncee, (char *)message, 0);
}
}
diff --git a/libpurple/account.c b/libpurple/account.c
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -690,7 +690,7 @@ set_user_info_cb(PurpleAccount *account,
purple_account_set_user_info(account, user_info);
gc = purple_account_get_connection(account);
- serv_set_info(gc, user_info);
+ purple_serv_set_info(gc, user_info);
}
void
@@ -1598,7 +1598,7 @@ purple_account_privacy_permit_add(Purple
priv->permit = g_slist_append(priv->permit, name);
if (!local_only && purple_account_is_connected(account))
- serv_add_permit(purple_account_get_connection(account), who);
+ purple_serv_add_permit(purple_account_get_connection(account), who);
if (ui_ops != NULL && ui_ops->permit_added != NULL)
ui_ops->permit_added(account, who);
@@ -1651,7 +1651,7 @@ purple_account_privacy_permit_remove(Pur
priv->permit = g_slist_delete_link(priv->permit, l);
if (!local_only && purple_account_is_connected(account))
- serv_rem_permit(purple_account_get_connection(account), who);
+ purple_serv_rem_permit(purple_account_get_connection(account), who);
if (ui_ops != NULL && ui_ops->permit_removed != NULL)
ui_ops->permit_removed(account, who);
@@ -1702,7 +1702,7 @@ purple_account_privacy_deny_add(PurpleAc
priv->deny = g_slist_append(priv->deny, name);
if (!local_only && purple_account_is_connected(account))
- serv_add_deny(purple_account_get_connection(account), who);
+ purple_serv_add_deny(purple_account_get_connection(account), who);
if (ui_ops != NULL && ui_ops->deny_added != NULL)
ui_ops->deny_added(account, who);
@@ -1753,7 +1753,7 @@ purple_account_privacy_deny_remove(Purpl
priv->deny = g_slist_delete_link(priv->deny, l);
if (!local_only && purple_account_is_connected(account))
- serv_rem_deny(purple_account_get_connection(account), name);
+ purple_serv_rem_deny(purple_account_get_connection(account), name);
if (ui_ops != NULL && ui_ops->deny_removed != NULL)
ui_ops->deny_removed(account, who);
@@ -1846,7 +1846,7 @@ purple_account_privacy_allow(PurpleAccou
/* Notify the server if the privacy setting was changed */
if (type != purple_account_get_privacy_type(account) && purple_account_is_connected(account))
- serv_set_permit_deny(purple_account_get_connection(account));
+ purple_serv_set_permit_deny(purple_account_get_connection(account));
}
void
@@ -1892,7 +1892,7 @@ purple_account_privacy_deny(PurpleAccoun
/* Notify the server if the privacy setting was changed */
if (type != purple_account_get_privacy_type(account) && purple_account_is_connected(account))
- serv_set_permit_deny(purple_account_get_connection(account));
+ purple_serv_set_permit_deny(purple_account_get_connection(account));
}
GSList *
diff --git a/libpurple/buddylist.c b/libpurple/buddylist.c
--- a/libpurple/buddylist.c
+++ b/libpurple/buddylist.c
@@ -961,7 +961,7 @@ void purple_blist_add_buddy(PurpleBuddy
/* the group totalsize will be taken care of by remove_contact below */
if (bnode->parent->parent != (PurpleBlistNode*)g)
- serv_move_buddy(buddy, (PurpleGroup *)bnode->parent->parent, g);
+ purple_serv_move_buddy(buddy, (PurpleGroup *)bnode->parent->parent, g);
if (bnode->next)
bnode->next->prev = bnode->prev;
@@ -1126,7 +1126,7 @@ void purple_blist_add_contact(PurpleCont
g_hash_table_replace(account_buddies, hb2, b);
if (purple_account_get_connection(account))
- serv_move_buddy(b, (PurpleGroup *)cnode->parent, g);
+ purple_serv_move_buddy(b, (PurpleGroup *)cnode->parent, g);
} else {
gboolean empty_contact = FALSE;
diff --git a/libpurple/connection.c b/libpurple/connection.c
--- a/libpurple/connection.c
+++ b/libpurple/connection.c
@@ -220,7 +220,7 @@ purple_connection_set_state(PurpleConnec
purple_signal_emit(purple_connections_get_handle(), "signed-on", gc);
purple_signal_emit_return_1(purple_connections_get_handle(), "autojoin", gc);
- serv_set_permit_deny(gc);
+ purple_serv_set_permit_deny(gc);
update_keepalive(gc, TRUE);
}
diff --git a/libpurple/conversation.c b/libpurple/conversation.c
--- a/libpurple/conversation.c
+++ b/libpurple/conversation.c
@@ -134,7 +134,7 @@ common_send(PurpleConversation *conv, co
if (sent != NULL && sent[0] != '\0') {
- err = serv_send_im(gc, purple_conversation_get_name(conv),
+ err = purple_serv_send_im(gc, purple_conversation_get_name(conv),
sent, msgflags);
if ((err > 0) && (displayed != NULL))
@@ -151,7 +151,7 @@ common_send(PurpleConversation *conv, co
account, &sent, id);
if (sent != NULL && sent[0] != '\0') {
- err = serv_chat_send(gc, id, sent, msgflags);
+ err = purple_serv_chat_send(gc, id, sent, msgflags);
purple_signal_emit(purple_conversations_get_handle(), "sent-chat-msg",
account, sent, id);
diff --git a/libpurple/conversationtypes.c b/libpurple/conversationtypes.c
--- a/libpurple/conversationtypes.c
+++ b/libpurple/conversationtypes.c
@@ -163,7 +163,7 @@ send_typed_cb(gpointer data)
*/
purple_im_conversation_set_type_again(im, 1);
- serv_send_typing(gc, name, PURPLE_IM_TYPED);
+ purple_serv_send_typing(gc, name, PURPLE_IM_TYPED);
purple_debug(PURPLE_DEBUG_MISC, "conversationtypes", "typed...\n");
}
@@ -486,7 +486,7 @@ purple_im_conversation_finalize(GObject
protocol = purple_connection_get_protocol(gc);
if (purple_prefs_get_bool("/purple/conversations/im/send_typing"))
- serv_send_typing(gc, name, PURPLE_IM_NOT_TYPING);
+ purple_serv_send_typing(gc, name, PURPLE_IM_NOT_TYPING);
purple_protocol_client_iface_convo_closed(protocol, gc, name);
}
@@ -1240,7 +1240,7 @@ invite_user_to_chat(gpointer data, Purpl
user = purple_request_fields_get_string(fields, "screenname");
message = purple_request_fields_get_string(fields, "message");
- serv_chat_invite(purple_conversation_get_connection(conv), priv->id, message, user);
+ purple_serv_chat_invite(purple_conversation_get_connection(conv), priv->id, message, user);
}
void purple_chat_conversation_invite_user(PurpleChatConversation *chat, const char *user,
@@ -1259,7 +1259,7 @@ void purple_chat_conversation_invite_use
account = purple_conversation_get_account(PURPLE_CONVERSATION(chat));
if (!confirm) {
- serv_chat_invite(purple_account_get_connection(account),
+ purple_serv_chat_invite(purple_account_get_connection(account),
purple_chat_conversation_get_id(chat), message, user);
return;
}
@@ -1490,11 +1490,11 @@ purple_chat_conversation_finalize(GObjec
#if 0
/*
* This is unfortunately necessary, because calling
- * serv_chat_leave() calls this purple_conversation_destroy(),
+ * purple_serv_chat_leave() calls this purple_conversation_destroy(),
More information about the Commits
mailing list