/soc/2013/ankitkv/gobjectification: cf3f735b09b7: Merge gtkdoc-c...
Ankit Vani
a at nevitus.org
Thu Feb 6 09:47:11 EST 2014
Changeset: cf3f735b09b74d78e0b58dec984846967977fb1e
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-06 20:02 +0530
Branch: soc.2013.gobjectification.plugins
URL: https://hg.pidgin.im/soc/2013/ankitkv/gobjectification/rev/cf3f735b09b7
Description:
Merge gtkdoc-conversion
diffstat:
ChangeLog.API | 23 ++++++++
finch/gntaccount.c | 4 +-
finch/gntaccount.h | 2 +-
finch/gntblist.c | 8 +-
finch/gntblist.h | 21 +++++---
finch/gntconn.h | 2 +-
finch/gntconv.h | 2 +-
finch/gntdebug.h | 2 +-
finch/gntidle.h | 2 +-
finch/gntlog.h | 2 +-
finch/gntmenuutil.h | 2 +-
finch/gntnotify.c | 2 +-
finch/gntnotify.h | 2 +-
finch/gntplugin.c | 6 +-
finch/gntplugin.h | 2 +-
finch/gntprefs.h | 2 +-
finch/gntrequest.c | 15 +++--
finch/gntrequest.h | 2 +-
finch/gntroomlist.h | 2 +-
finch/gntsound.h | 2 +-
finch/gntstatus.c | 8 +-
finch/gntstatus.h | 2 +-
finch/gntxfer.h | 4 +-
finch/libgnt/gnt-skel.c | 2 +-
finch/libgnt/gnt-skel.h | 4 +-
finch/libgnt/gnt.h | 12 ++--
finch/libgnt/gntbindable.c | 2 +-
finch/libgnt/gntbindable.h | 4 +-
finch/libgnt/gntbox.c | 2 +-
finch/libgnt/gntbox.h | 4 +-
finch/libgnt/gntbutton.c | 2 +-
finch/libgnt/gntbutton.h | 4 +-
finch/libgnt/gntcheckbox.c | 2 +-
finch/libgnt/gntcheckbox.h | 4 +-
finch/libgnt/gntclipboard.c | 2 +-
finch/libgnt/gntclipboard.h | 4 +-
finch/libgnt/gntcombobox.c | 2 +-
finch/libgnt/gntcombobox.h | 4 +-
finch/libgnt/gntentry.c | 2 +-
finch/libgnt/gntentry.h | 8 +-
finch/libgnt/gntfilesel.c | 2 +-
finch/libgnt/gntfilesel.h | 4 +-
finch/libgnt/gntlabel.c | 2 +-
finch/libgnt/gntlabel.h | 4 +-
finch/libgnt/gntline.c | 2 +-
finch/libgnt/gntline.h | 4 +-
finch/libgnt/gntmenu.c | 2 +-
finch/libgnt/gntmenu.h | 4 +-
finch/libgnt/gntmenuitem.c | 2 +-
finch/libgnt/gntmenuitem.h | 6 +-
finch/libgnt/gntmenuitemcheck.c | 2 +-
finch/libgnt/gntmenuitemcheck.h | 4 +-
finch/libgnt/gntprogressbar.c | 2 +-
finch/libgnt/gntprogressbar.h | 4 +-
finch/libgnt/gntslider.c | 2 +-
finch/libgnt/gntslider.h | 4 +-
finch/libgnt/gntstyle.h | 9 +-
finch/libgnt/gnttextview.c | 2 +-
finch/libgnt/gnttextview.h | 4 +-
finch/libgnt/gnttree.c | 2 +-
finch/libgnt/gnttree.h | 65 ++++++++----------------
finch/libgnt/gntwidget.c | 2 +-
finch/libgnt/gntwidget.h | 11 ++-
finch/libgnt/gntwindow.c | 2 +-
finch/libgnt/gntwindow.h | 4 +-
finch/libgnt/gntwm.c | 2 +-
finch/libgnt/gntwm.h | 9 +-
finch/libgnt/gntws.c | 2 +-
finch/libgnt/gntws.h | 4 +-
finch/libgnt/wms/irssi.c | 6 +-
finch/libgnt/wms/s.c | 6 +-
libpurple/account.c | 54 ++++++++++----------
libpurple/account.h | 2 +-
libpurple/accountopt.c | 32 ++++++------
libpurple/accountopt.h | 6 +-
libpurple/accounts.c | 18 +++---
libpurple/accounts.h | 6 +-
libpurple/blistnode.c | 20 +++----
libpurple/blistnode.h | 44 ++++++----------
libpurple/blistnodetypes.c | 60 ++++++++++------------
libpurple/blistnodetypes.h | 8 +-
libpurple/buddyicon.h | 8 +-
libpurple/buddylist.h | 14 ++--
libpurple/certificate.h | 10 +-
libpurple/cipher.h | 4 +-
libpurple/cmds.h | 9 +-
libpurple/connection.h | 16 +++--
libpurple/conversation.h | 12 ++--
libpurple/conversations.h | 2 +-
libpurple/conversationtypes.h | 8 +-
libpurple/dbus-server.c | 8 +-
libpurple/debug.h | 16 +++---
libpurple/dnsquery.c | 2 +-
libpurple/dnsquery.h | 5 +-
libpurple/dnssrv.c | 6 +-
libpurple/dnssrv.h | 4 +-
libpurple/e2ee.h | 4 +-
libpurple/eventloop.h | 7 +-
libpurple/http.c | 4 +-
libpurple/http.h | 22 ++++----
libpurple/idle.h | 4 +-
libpurple/imgstore.c | 6 +-
libpurple/keyring.h | 16 +++---
libpurple/log.h | 65 +++++++++++++-----------
libpurple/mediamanager.h | 2 +-
libpurple/network.h | 2 +-
libpurple/notify.c | 5 +-
libpurple/notify.h | 13 ++--
libpurple/pluginpref.c | 10 +-
libpurple/pluginpref.h | 6 +-
libpurple/plugins/autoaccept.c | 2 +-
libpurple/plugins/perl/common/AccountOpts.xs | 2 +-
libpurple/plugins/perl/common/PluginPref.xs | 6 +-
libpurple/plugins/perl/common/Prefs.xs | 2 +-
libpurple/plugins/perl/common/Proxy.xs | 4 +-
libpurple/plugins/perl/common/Request.xs | 4 +-
libpurple/plugins/perl/common/SavedStatuses.xs | 6 +-
libpurple/plugins/pluginpref_example.c | 4 +-
libpurple/plugins/tcl/tcl_cmds.c | 8 +-
libpurple/pounce.h | 4 +-
libpurple/prefs.c | 2 +-
libpurple/prefs.h | 10 +-
libpurple/presence.h | 6 +-
libpurple/protocols.c | 14 ++--
libpurple/protocols.h | 12 ++--
libpurple/protocols/bonjour/bonjour_ft.c | 2 +-
libpurple/protocols/bonjour/jabber.c | 2 +-
libpurple/protocols/gg/deprecated.c | 4 +-
libpurple/protocols/gg/validator.c | 8 +-
libpurple/protocols/jabber/si.c | 4 +-
libpurple/protocols/msn/group.h | 2 +-
libpurple/protocols/msn/msn.c | 2 +-
libpurple/protocols/msn/user.h | 2 +-
libpurple/protocols/sametime/sametime.c | 2 +-
libpurple/protocols/yahoo/util.c | 2 +-
libpurple/proxy.c | 36 ++++++------
libpurple/proxy.h | 10 +-
libpurple/request-datasheet.h | 10 +-
libpurple/request.c | 6 +-
libpurple/request.h | 50 +++++++++---------
libpurple/roomlist.c | 14 ++--
libpurple/roomlist.h | 26 ++++++---
libpurple/savedstatuses.c | 12 ++--
libpurple/savedstatuses.h | 23 ++++----
libpurple/server.h | 3 +-
libpurple/signals.h | 4 +-
libpurple/smiley.c | 12 ++--
libpurple/smiley.h | 7 +-
libpurple/sound-theme-loader.h | 5 +-
libpurple/sound-theme.h | 5 +-
libpurple/sound.h | 2 +-
libpurple/sslconn.h | 4 +-
libpurple/status.h | 24 ++++----
libpurple/stun.h | 2 +-
libpurple/theme-loader.h | 5 +-
libpurple/theme-manager.h | 6 +-
libpurple/theme.h | 5 +-
libpurple/upnp.h | 2 +-
libpurple/util.h | 67 ++++++++++++-------------
libpurple/whiteboard.c | 17 +++---
libpurple/whiteboard.h | 2 +-
libpurple/xfer.h | 4 +-
pidgin/gtkaccount.c | 8 +-
pidgin/gtkblist-theme-loader.h | 6 +-
pidgin/gtkblist-theme.h | 7 +-
pidgin/gtkblist.c | 2 +-
pidgin/gtkblist.h | 12 ++--
pidgin/gtkcertmgr.h | 4 +-
pidgin/gtkconn.h | 2 +-
pidgin/gtkconv-theme-loader.h | 6 +-
pidgin/gtkconv-theme.h | 5 +-
pidgin/gtkconv.h | 6 +-
pidgin/gtkconvwin.h | 6 +-
pidgin/gtkdocklet.c | 10 +-
pidgin/gtkicon-theme-loader.h | 5 +-
pidgin/gtkicon-theme.h | 5 +-
pidgin/gtkidle.h | 2 +-
pidgin/gtklog.h | 2 +-
pidgin/gtkpluginpref.c | 8 +-
pidgin/gtkprefs.c | 6 +-
pidgin/gtkrequest.c | 12 ++--
pidgin/gtkrequest.h | 2 +-
pidgin/gtkroomlist.c | 2 +-
pidgin/gtksavedstatuses.c | 17 +++---
pidgin/gtksession.h | 2 +-
pidgin/gtksmiley.h | 3 +-
pidgin/gtksound.h | 2 +-
pidgin/gtkstatus-icon-theme.h | 5 +-
pidgin/gtkstatusbox.c | 21 ++++---
pidgin/gtkthemes.h | 2 +-
pidgin/gtkutils.h | 2 +-
pidgin/gtkwhiteboard.h | 2 +-
pidgin/gtkxfer.h | 4 +-
pidgin/minidialog.h | 3 +-
pidgin/pidginstock.h | 5 +-
pidgin/plugins/contact_priority.c | 4 +-
pidgin/plugins/extplacement.c | 2 +-
pidgin/plugins/unity.c | 2 +-
198 files changed, 788 insertions(+), 788 deletions(-)
diffs (truncated from 6259 to 300 lines):
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -214,6 +214,8 @@ version 3.0.0 (??/??/????):
details.
* purple_account_get_alias renamed to purple_account_get_private_alias
* purple_account_set_alias renamed to purple_account_set_private_alias
+ * purple_account_option_get_type renamed to
+ purple_account_option_get_pref_type
* PurplePrivacyType renamed to PurpleAccountPrivacyType
* purple_privacy_* functions are now purple_account_privacy_*
* Removed arguments local and restore from purple_account_privacy_allow
@@ -287,6 +289,10 @@ version 3.0.0 (??/??/????):
purple_notify_user_info_add_pair_html
* purple_notify_user_info_get_entries returns a GQueue instead of
a GList
+ * purple_notify_user_info_entry_get_type renamed to
+ purple_notify_user_info_entry_get_entry_type
+ * purple_notify_user_info_entry_set_type renamed to
+ purple_notify_user_info_entry_set_entry_type
* purple_notify_user_info_prepend_pair renamed to
purple_notify_user_info_prepend_pair_html
* PurplePlugin is now a GObject (alias for GPluginPlugin). Please see
@@ -310,14 +316,31 @@ version 3.0.0 (??/??/????):
* purple_plugins_find_with_id renamed to purple_plugins_find_plugin
* purple_plugins_find_with_filename renamed to
purple_plugins_find_by_filename
+ * purple_plugin_pref_get_type renamed to
+ purple_plugin_pref_get_pref_type
+ * purple_plugin_pref_set_type renamed to
+ purple_plugin_pref_set_pref_type
+ * purple_prefs_get_type renamed to purple_prefs_get_pref_type
* proto_chat_entry has been renamed to PurpleProtocolChatEntry
+ * purple_proxy_info_get_type renamed to purple_proxy_info_get_proxy_type
+ * purple_proxy_info_set_type renamed to purple_proxy_info_set_proxy_type
+ * purple_request_field_get_type renamed to
+ purple_request_field_get_field_type
* PurpleRoomlist is now a GObject. Please see the documentation for
details.
* purple_roomlist_room_get_type is now
purple_roomlist_room_get_room_type
* purple_roomlist_field_get_type is now
purple_roomlist_field_get_field_type
+ * purple_savedstatus_get_type renamed to
+ purple_savedstatus_get_primitive_type
+ * purple_savedstatus_set_type renamed to
+ purple_savedstatus_set_primitive_type
+ * purple_savedstatus_substatus_get_type renamed to
+ purple_savedstatus_substatus_get_status_type
* 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
* PurpleStatus is now a GObject. Please see the documentation for
details.
* purple_status_attr_* functions are now purple_status_attribute_*
diff --git a/finch/gntaccount.c b/finch/gntaccount.c
--- a/finch/gntaccount.c
+++ b/finch/gntaccount.c
@@ -218,7 +218,7 @@ save_account_cb(AccountEditDialog *dialo
{
PurpleAccountOption *option = iter->data;
GntWidget *entry = entries->data;
- PurplePrefType type = purple_account_option_get_type(option);
+ PurplePrefType type = purple_account_option_get_pref_type(option);
const char *setting = purple_account_option_get_setting(option);
if (type == PURPLE_PREF_STRING)
@@ -403,7 +403,7 @@ add_account_options(AccountEditDialog *d
for (iter = purple_protocol_get_account_options(protocol); iter; iter = iter->next)
{
PurpleAccountOption *option = iter->data;
- PurplePrefType type = purple_account_option_get_type(option);
+ PurplePrefType type = purple_account_option_get_pref_type(option);
box = gnt_hbox_new(TRUE);
gnt_box_set_pad(GNT_BOX(box), 0);
diff --git a/finch/gntaccount.h b/finch/gntaccount.h
--- a/finch/gntaccount.h
+++ b/finch/gntaccount.h
@@ -31,7 +31,7 @@
#include "account.h"
/**********************************************************************
- * @name GNT Account API
+ * GNT Account API
**********************************************************************/
/*@{*/
diff --git a/finch/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -1092,7 +1092,7 @@ chat_components_edit_ok(PurpleChat *chat
char *val;
id = purple_request_field_get_id(field);
- if (purple_request_field_get_type(field) == PURPLE_REQUEST_FIELD_INTEGER)
+ if (purple_request_field_get_field_type(field) == PURPLE_REQUEST_FIELD_INTEGER)
val = g_strdup_printf("%d", purple_request_field_int_get_value(field));
else
val = g_strdup(purple_request_field_string_get_value(field));
@@ -2173,7 +2173,7 @@ remove_typing_cb(gpointer null)
current = purple_savedstatus_get_current();
message = purple_savedstatus_get_message(current);
- prim = purple_savedstatus_get_type(current);
+ prim = purple_savedstatus_get_primitive_type(current);
newmessage = gnt_entry_get_text(GNT_ENTRY(ggblist->statustext));
item = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(ggblist->status));
@@ -2184,7 +2184,7 @@ remove_typing_cb(gpointer null)
newprim = item->u.prim;
break;
case STATUS_SAVED_POPULAR:
- newprim = purple_savedstatus_get_type(item->u.saved);
+ newprim = purple_savedstatus_get_primitive_type(item->u.saved);
break;
default:
goto end; /* 'New' or 'Saved' is selected, but this should never happen. */
@@ -2285,7 +2285,7 @@ savedstatus_changed(PurpleSavedStatus *n
g_signal_handlers_block_matched(ggblist->statustext, G_SIGNAL_MATCH_FUNC,
0, 0, NULL, status_text_changed, NULL);
- prim = purple_savedstatus_get_type(now);
+ prim = purple_savedstatus_get_primitive_type(now);
message = purple_savedstatus_get_message(now);
/* Rebuild the status dropdown */
diff --git a/finch/gntblist.h b/finch/gntblist.h
--- a/finch/gntblist.h
+++ b/finch/gntblist.h
@@ -32,7 +32,7 @@
#include "gnttree.h"
/**********************************************************************
- * @name GNT BuddyList API
+ * GNT BuddyList API
**********************************************************************/
/*@{*/
@@ -40,8 +40,13 @@ typedef struct _FinchBlistManager Finch
/**
* FinchBlistManager:
- * @id: An identifier for the manager.
- * @name: Displayable name for the manager.
+ * @id: An identifier for the manager.
+ * @name: Displayable name for the manager.
+ * @init: Called right before it's being used.
+ * @uninit: Called right after it's not being used any more.
+ * @can_add_node: Whether a node should be added to the view.
+ * @find_parent: Find the parent row for a node.
+ * @create_tooltip: Create tooltip for a selected row.
*
* Buddylist manager for finch. This decides the visility, ordering and hierarchy
* of the buddylist nodes. This also manages the creation of tooltips.
@@ -50,11 +55,11 @@ struct _FinchBlistManager
{
const char *id;
const char *name;
- gboolean (*init)(void); /**< Called right before it's being used. */
- gboolean (*uninit)(void); /**< Called right after it's not being used any more. */
- gboolean (*can_add_node)(PurpleBlistNode *node); /**< Whether a node should be added to the view. */
- gpointer (*find_parent)(PurpleBlistNode *node); /**< Find the parent row for a node. */
- gboolean (*create_tooltip)(gpointer selected_row, GString **body, char **title); /**< Create tooltip for a selected row. */
+ gboolean (*init)(void);
+ gboolean (*uninit)(void);
+ gboolean (*can_add_node)(PurpleBlistNode *node);
+ gpointer (*find_parent)(PurpleBlistNode *node);
+ gboolean (*create_tooltip)(gpointer selected_row, GString **body, char **title);
/*< private >*/
gpointer reserved[4];
diff --git a/finch/gntconn.h b/finch/gntconn.h
--- a/finch/gntconn.h
+++ b/finch/gntconn.h
@@ -31,7 +31,7 @@
#include "connection.h"
/**********************************************************************
- * @name GNT Connection API
+ * GNT Connection API
**********************************************************************/
/*@{*/
diff --git a/finch/gntconv.h b/finch/gntconv.h
--- a/finch/gntconv.h
+++ b/finch/gntconv.h
@@ -38,7 +38,7 @@
#define FINCH_CONV(conv) ((FinchConv *)purple_conversation_get_ui_data(conv))
/***************************************************************************
- * @name GNT Conversations API
+ * GNT Conversations API
***************************************************************************/
/*@{*/
diff --git a/finch/gntdebug.h b/finch/gntdebug.h
--- a/finch/gntdebug.h
+++ b/finch/gntdebug.h
@@ -31,7 +31,7 @@
#include "debug.h"
/**********************************************************************
- * @name GNT Debug API
+ * GNT Debug API
**********************************************************************/
/*@{*/
diff --git a/finch/gntidle.h b/finch/gntidle.h
--- a/finch/gntidle.h
+++ b/finch/gntidle.h
@@ -31,7 +31,7 @@
#include "idle.h"
/**************************************************************************/
-/** @name GNT Idle API */
+/* GNT Idle API */
/**************************************************************************/
/*@{*/
diff --git a/finch/gntlog.h b/finch/gntlog.h
--- a/finch/gntlog.h
+++ b/finch/gntlog.h
@@ -66,7 +66,7 @@ void finch_log_show_contact(PurpleContac
void finch_syslog_show(void);
/**************************************************************************/
-/** @name GNT Log Subsystem */
+/* GNT Log Subsystem */
/**************************************************************************/
/*@{*/
diff --git a/finch/gntmenuutil.h b/finch/gntmenuutil.h
--- a/finch/gntmenuutil.h
+++ b/finch/gntmenuutil.h
@@ -32,7 +32,7 @@
#include <gntmenu.h>
/***************************************************************************
- * @name GNT Menu Utility Functions
+ * GNT Menu Utility Functions
***************************************************************************/
/*@{*/
diff --git a/finch/gntnotify.c b/finch/gntnotify.c
--- a/finch/gntnotify.c
+++ b/finch/gntnotify.c
@@ -292,7 +292,7 @@ purple_notify_user_info_get_xhtml(Purple
for (l = purple_notify_user_info_get_entries(user_info)->head; l != NULL;
l = l->next) {
PurpleNotifyUserInfoEntry *user_info_entry = l->data;
- PurpleNotifyUserInfoEntryType type = purple_notify_user_info_entry_get_type(user_info_entry);
+ PurpleNotifyUserInfoEntryType type = purple_notify_user_info_entry_get_entry_type(user_info_entry);
const char *label = purple_notify_user_info_entry_get_label(user_info_entry);
const char *value = purple_notify_user_info_entry_get_value(user_info_entry);
diff --git a/finch/gntnotify.h b/finch/gntnotify.h
--- a/finch/gntnotify.h
+++ b/finch/gntnotify.h
@@ -31,7 +31,7 @@
#include "notify.h"
/**********************************************************************
- * @name GNT Notify API
+ * GNT Notify API
**********************************************************************/
/*@{*/
diff --git a/finch/gntplugin.c b/finch/gntplugin.c
--- a/finch/gntplugin.c
+++ b/finch/gntplugin.c
@@ -647,7 +647,7 @@ process_pref_frame(PurplePluginPrefFrame
if(label == NULL)
continue;
- if(purple_plugin_pref_get_type(pref) == PURPLE_PLUGIN_PREF_INFO) {
+ if(purple_plugin_pref_get_pref_type(pref) == PURPLE_PLUGIN_PREF_INFO) {
field = purple_request_field_label_new("*", purple_plugin_pref_get_label(pref));
purple_request_field_group_add_field(group, field);
} else {
@@ -658,8 +658,8 @@ process_pref_frame(PurplePluginPrefFrame
}
field = NULL;
- type = purple_prefs_get_type(name);
- if(purple_plugin_pref_get_type(pref) == PURPLE_PLUGIN_PREF_CHOICE) {
+ type = purple_prefs_get_pref_type(name);
+ if(purple_plugin_pref_get_pref_type(pref) == PURPLE_PLUGIN_PREF_CHOICE) {
GList *list = purple_plugin_pref_get_choices(pref);
gpointer current_value = NULL;
diff --git a/finch/gntplugin.h b/finch/gntplugin.h
--- a/finch/gntplugin.h
+++ b/finch/gntplugin.h
@@ -111,7 +111,7 @@ FinchPluginInfo *finch_plugin_info_new(c
/*@}*/
/**********************************************************************
- * @name GNT Plugins API
+ * GNT Plugins API
More information about the Commits
mailing list