/pidgin/main: 5d9e2581005b: gtk-doc prep: *_get_type() functions...
Ankit Vani
a at nevitus.org
Thu Feb 6 09:14:40 EST 2014
Changeset: 5d9e2581005b966dcc2011bc1371c35e02970022
Author: Ankit Vani <a at nevitus.org>
Date: 2014-02-06 18:56 +0530
Branch: default
URL: https://hg.pidgin.im/pidgin/main/rev/5d9e2581005b
Description:
gtk-doc prep: *_get_type() functions are hidden as standard GType-returning funcs, so rename them.
- purple_savedstatus_[gs]et_type renamed to purple_savedstatus_[gs]et_primitive_type
- purple_account_option_get_type renamed to purple_account_option_get_pref_type
- purple_srv_txt_query_get_type renamed to purple_srv_txt_query_get_query_type
- purple_notify_user_info_entry_[gs]et_type renamed to purple_notify_user_info_entry_[gs]et_entry_type
- purple_plugin_pref_[gs]et_type renamed to purple_plugin_pref_[gs]et_pref_type
- purple_prefs_get_type renamed to purple_prefs_get_pref_type
- purple_proxy_info_[gs]et_type renamed to purple_proxy_info_[gs]et_proxy_type
- purple_request_field_get_type renamed to purple_request_field_get_field_type
- purple_savedstatus_substatus_get_type renamed to purple_savedstatus_substatus_get_status_type
diffstat:
ChangeLog.API | 23 ++++++++++++++++
finch/gntaccount.c | 4 +-
finch/gntblist.c | 8 ++--
finch/gntnotify.c | 2 +-
finch/gntplugin.c | 6 ++--
finch/gntrequest.c | 15 +++++-----
finch/gntstatus.c | 8 ++--
libpurple/account.c | 2 +-
libpurple/accountopt.c | 2 +-
libpurple/accountopt.h | 2 +-
libpurple/accounts.c | 18 ++++++------
libpurple/dnsquery.c | 2 +-
libpurple/dnssrv.c | 6 ++--
libpurple/dnssrv.h | 4 +-
libpurple/http.c | 4 +-
libpurple/notify.c | 5 ++-
libpurple/notify.h | 7 ++--
libpurple/pluginpref.c | 10 +++---
libpurple/pluginpref.h | 4 +-
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/prefs.c | 2 +-
libpurple/prefs.h | 2 +-
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/msn.c | 2 +-
libpurple/protocols/sametime/sametime.c | 2 +-
libpurple/protocols/yahoo/util.c | 2 +-
libpurple/proxy.c | 36 +++++++++++++-------------
libpurple/proxy.h | 4 +-
libpurple/request.c | 6 ++--
libpurple/request.h | 4 +-
libpurple/savedstatuses.c | 12 ++++----
libpurple/savedstatuses.h | 13 +++++----
libpurple/status.h | 10 +++---
pidgin/gtkaccount.c | 8 ++--
pidgin/gtkblist.c | 2 +-
pidgin/gtkdocklet.c | 10 +++---
pidgin/gtkpluginpref.c | 8 ++--
pidgin/gtkprefs.c | 6 ++--
pidgin/gtkrequest.c | 12 ++++----
pidgin/gtksavedstatuses.c | 17 ++++++-----
pidgin/gtkstatusbox.c | 21 +++++++-------
pidgin/plugins/contact_priority.c | 4 +-
pidgin/plugins/extplacement.c | 2 +-
pidgin/plugins/unity.c | 2 +-
56 files changed, 203 insertions(+), 174 deletions(-)
diffs (truncated from 1685 to 300 lines):
diff --git a/ChangeLog.API b/ChangeLog.API
--- a/ChangeLog.API
+++ b/ChangeLog.API
@@ -143,6 +143,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
@@ -215,15 +217,36 @@ 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
+ * 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
+ * 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
@@ -225,7 +225,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)
@@ -415,7 +415,7 @@ add_protocol_options(AccountEditDialog *
for (iter = prplinfo->protocol_options; 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/gntblist.c b/finch/gntblist.c
--- a/finch/gntblist.c
+++ b/finch/gntblist.c
@@ -1097,7 +1097,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));
@@ -2180,7 +2180,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));
@@ -2191,7 +2191,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. */
@@ -2292,7 +2292,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/gntnotify.c b/finch/gntnotify.c
--- a/finch/gntnotify.c
+++ b/finch/gntnotify.c
@@ -297,7 +297,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/gntplugin.c b/finch/gntplugin.c
--- a/finch/gntplugin.c
+++ b/finch/gntplugin.c
@@ -509,7 +509,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 {
@@ -520,8 +520,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/gntrequest.c b/finch/gntrequest.c
--- a/finch/gntrequest.c
+++ b/finch/gntrequest.c
@@ -312,7 +312,7 @@ request_fields_cb(GntWidget *button, Pur
for (; fields ; fields = fields->next)
{
PurpleRequestField *field = fields->data;
- PurpleRequestFieldType type = purple_request_field_get_type(field);
+ PurpleRequestFieldType type = purple_request_field_get_field_type(field);
if (!purple_request_field_is_visible(field))
continue;
if (type == PURPLE_REQUEST_FIELD_BOOLEAN)
@@ -433,7 +433,7 @@ create_boolean_field(PurpleRequestField
static GntWidget*
create_string_field(PurpleRequestField *field, GntWidget **username)
{
- const char *hint = purple_request_field_get_type_hint(field);
+ const char *hint = purple_request_field_get_field_type_hint(field);
GntWidget *entry = gnt_entry_new(
purple_request_field_string_get_default_value(field));
gnt_entry_set_masked(GNT_ENTRY(entry),
@@ -628,7 +628,7 @@ finch_request_fields(const char *title,
for (; fields ; fields = fields->next)
{
PurpleRequestField *field = fields->data;
- PurpleRequestFieldType type = purple_request_field_get_type(field);
+ PurpleRequestFieldType type = purple_request_field_get_field_type(field);
const char *label = purple_request_field_get_label(field);
if (!purple_request_field_is_visible(field))
@@ -848,7 +848,7 @@ void finch_request_save_in_prefs(gpointe
for (; fields ; fields = fields->next) {
PurpleRequestField *field = fields->data;
- PurpleRequestFieldType type = purple_request_field_get_type(field);
+ PurpleRequestFieldType type = purple_request_field_get_field_type(field);
PurplePrefType pt;
gpointer val = NULL;
const char *id = purple_request_field_get_id(field);
@@ -871,7 +871,7 @@ void finch_request_save_in_prefs(gpointe
break;
}
- pt = purple_prefs_get_type(id);
+ pt = purple_prefs_get_pref_type(id);
switch (pt) {
case PURPLE_PREF_INT:
{
@@ -897,7 +897,7 @@ void finch_request_save_in_prefs(gpointe
GntWidget *finch_request_field_get_widget(PurpleRequestField *field)
{
GntWidget *ret = NULL;
- switch (purple_request_field_get_type(field)) {
+ switch (purple_request_field_get_field_type(field)) {
case PURPLE_REQUEST_FIELD_BOOLEAN:
ret = create_boolean_field(field);
break;
@@ -917,7 +917,8 @@ GntWidget *finch_request_field_get_widge
ret = create_account_field(field);
break;
default:
- purple_debug_error("GntRequest", "Unimplemented request-field %d\n", purple_request_field_get_type(field));
+ purple_debug_error("GntRequest", "Unimplemented request-field %d\n",
+ purple_request_field_get_field_type(field));
break;
}
return ret;
diff --git a/finch/gntstatus.c b/finch/gntstatus.c
--- a/finch/gntstatus.c
+++ b/finch/gntstatus.c
@@ -99,7 +99,7 @@ populate_statuses(GntTree *tree)
continue;
title = purple_savedstatus_get_title(saved);
- type = purple_primitive_get_name_from_type(purple_savedstatus_get_type(saved));
+ type = purple_primitive_get_name_from_type(purple_savedstatus_get_primitive_type(saved));
message = purple_savedstatus_get_message(saved); /* XXX: Strip possible markups */
gnt_tree_add_row_last(tree, saved,
@@ -327,7 +327,7 @@ save_savedstatus_cb(GntWidget *button, E
else
{
purple_savedstatus_set_title(edit->saved, title);
- purple_savedstatus_set_type(edit->saved, prim);
+ purple_savedstatus_set_primitive_type(edit->saved, prim);
purple_savedstatus_set_message(edit->saved, message);
if (statuses.tree)
{
@@ -363,7 +363,7 @@ add_substatus(EditStatus *edit, PurpleAc
if (sub)
{
- key->type = purple_savedstatus_substatus_get_type(sub);
+ key->type = purple_savedstatus_substatus_get_status_type(sub);
type = purple_status_type_get_name(key->type);
message = purple_savedstatus_substatus_get_message(sub);
key->message = g_strdup(message);
@@ -550,7 +550,7 @@ void finch_savedstatus_edit(PurpleSavedS
edit->type = combo = gnt_combo_box_new();
gnt_box_add_widget(GNT_BOX(box), combo);
- current = saved ? purple_savedstatus_get_type(saved) : PURPLE_STATUS_UNSET;
+ current = saved ? purple_savedstatus_get_primitive_type(saved) : PURPLE_STATUS_UNSET;
for (i = 0; prims[i] != PURPLE_STATUS_UNSET; i++)
{
gnt_combo_box_add_data(GNT_COMBO_BOX(combo), GINT_TO_POINTER(prims[i]),
diff --git a/libpurple/account.c b/libpurple/account.c
--- a/libpurple/account.c
+++ b/libpurple/account.c
@@ -2609,7 +2609,7 @@ proxy_settings_to_xmlnode(PurpleProxyInf
int int_value;
char buf[21];
- proxy_type = purple_proxy_info_get_type(proxy_info);
+ proxy_type = purple_proxy_info_get_proxy_type(proxy_info);
node = purple_xmlnode_new("proxy");
diff --git a/libpurple/accountopt.c b/libpurple/accountopt.c
--- a/libpurple/accountopt.c
+++ b/libpurple/accountopt.c
@@ -283,7 +283,7 @@ purple_account_option_add_list_item(Purp
}
PurplePrefType
-purple_account_option_get_type(const PurpleAccountOption *option)
+purple_account_option_get_pref_type(const PurpleAccountOption *option)
{
g_return_val_if_fail(option != NULL, PURPLE_PREF_NONE);
diff --git a/libpurple/accountopt.h b/libpurple/accountopt.h
--- a/libpurple/accountopt.h
+++ b/libpurple/accountopt.h
@@ -203,7 +203,7 @@ void purple_account_option_add_list_item
*
* @return The account option's type.
*/
-PurplePrefType purple_account_option_get_type(const PurpleAccountOption *option);
+PurplePrefType purple_account_option_get_pref_type(const PurpleAccountOption *option);
/**
* Returns the text for an account option.
diff --git a/libpurple/accounts.c b/libpurple/accounts.c
--- a/libpurple/accounts.c
+++ b/libpurple/accounts.c
@@ -346,26 +346,26 @@ parse_proxy_info(PurpleXmlNode *node, Pu
proxy_info = purple_proxy_info_new();
/* Use the global proxy settings, by default */
- purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_USE_GLOBAL);
+ purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_USE_GLOBAL);
/* Read proxy type */
child = purple_xmlnode_get_child(node, "type");
if ((child != NULL) && ((data = purple_xmlnode_get_data(child)) != NULL))
{
More information about the Commits
mailing list