changeset
Merged default branch
Thu, 06 Feb 2014 19:50:34 +0530
- author
- Ankit Vani <a@nevitus.org>
- date
- Thu, 06 Feb 2014 19:50:34 +0530
- branch
- gtkdoc-conversion
- changeset 35475
- ec0d44434ba8
- parent 35474
- ff5eccb9f797 (current diff)
- parent 35379
- ea1a0327001e (diff)
- child 35476
- 8f1484ee3e1c
- child 37075
- cf3f735b09b7
Merged default branch
--- a/ChangeLog.API Thu Feb 06 18:40:31 2014 +0530 +++ b/ChangeLog.API Thu Feb 06 19:50:34 2014 +0530 @@ -143,6 +143,8 @@ 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 @@ 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_*
--- a/finch/gntaccount.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/gntaccount.c Thu Feb 06 19:50:34 2014 +0530 @@ -220,7 +220,7 @@ { 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) @@ -410,7 +410,7 @@ 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);
--- a/finch/gntblist.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/gntblist.c Thu Feb 06 19:50:34 2014 +0530 @@ -1092,7 +1092,7 @@ 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)); @@ -2175,7 +2175,7 @@ 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)); @@ -2186,7 +2186,7 @@ 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. */ @@ -2287,7 +2287,7 @@ 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 */
--- a/finch/gntnotify.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/gntnotify.c Thu Feb 06 19:50:34 2014 +0530 @@ -292,7 +292,7 @@ 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);
--- a/finch/gntplugin.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/gntplugin.c Thu Feb 06 19:50:34 2014 +0530 @@ -504,7 +504,7 @@ 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 { @@ -515,8 +515,8 @@ } 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;
--- a/finch/gntrequest.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/gntrequest.c Thu Feb 06 19:50:34 2014 +0530 @@ -308,7 +308,7 @@ 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) @@ -429,7 +429,7 @@ 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), @@ -624,7 +624,7 @@ 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)) @@ -844,7 +844,7 @@ 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); @@ -867,7 +867,7 @@ break; } - pt = purple_prefs_get_type(id); + pt = purple_prefs_get_pref_type(id); switch (pt) { case PURPLE_PREF_INT: { @@ -893,7 +893,7 @@ 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; @@ -913,7 +913,8 @@ 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;
--- a/finch/gntstatus.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/gntstatus.c Thu Feb 06 19:50:34 2014 +0530 @@ -94,7 +94,7 @@ 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, @@ -322,7 +322,7 @@ 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) { @@ -358,7 +358,7 @@ 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); @@ -545,7 +545,7 @@ 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]),
--- a/finch/libgnt/gnt-skel.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gnt-skel.c Thu Feb 06 19:50:34 2014 +0530 @@ -92,7 +92,7 @@ * GntSkel API *****************************************************************************/ GType -gnt_skel_get_gtype(void) +gnt_skel_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gnt-skel.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gnt-skel.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gntcolors.h" #include "gntkeys.h" -#define GNT_TYPE_SKEL (gnt_skel_get_gtype()) +#define GNT_TYPE_SKEL (gnt_skel_get_type()) #define GNT_SKEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_SKEL, GntSkel)) #define GNT_SKEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_SKEL, GntSkelClass)) #define GNT_IS_SKEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_SKEL)) @@ -63,7 +63,7 @@ G_BEGIN_DECLS -GType gnt_skel_get_gtype(void); +GType gnt_skel_get_type(void); GntWidget * gnt_skel_new();
--- a/finch/libgnt/gntbindable.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntbindable.c Thu Feb 06 19:50:34 2014 +0530 @@ -257,7 +257,7 @@ * GntBindable API *****************************************************************************/ GType -gnt_bindable_get_gtype(void) +gnt_bindable_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntbindable.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntbindable.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include <glib-object.h> #include <ncurses.h> -#define GNT_TYPE_BINDABLE (gnt_bindable_get_gtype()) +#define GNT_TYPE_BINDABLE (gnt_bindable_get_type()) #define GNT_BINDABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_BINDABLE, GntBindable)) #define GNT_BINDABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_BINDABLE, GntBindableClass)) #define GNT_IS_BINDABLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_BINDABLE)) @@ -69,7 +69,7 @@ G_BEGIN_DECLS -GType gnt_bindable_get_gtype(void); +GType gnt_bindable_get_type(void); /******************/ /* Key Remaps */
--- a/finch/libgnt/gntbox.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntbox.c Thu Feb 06 19:50:34 2014 +0530 @@ -633,7 +633,7 @@ * GntBox API *****************************************************************************/ GType -gnt_box_get_gtype(void) +gnt_box_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntbox.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntbox.h Thu Feb 06 19:50:34 2014 +0530 @@ -32,7 +32,7 @@ #include "gnt.h" #include "gntwidget.h" -#define GNT_TYPE_BOX (gnt_box_get_gtype()) +#define GNT_TYPE_BOX (gnt_box_get_type()) #define GNT_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_BOX, GntBox)) #define GNT_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_BOX, GntBoxClass)) #define GNT_IS_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_BOX)) @@ -98,7 +98,7 @@ * * Returns: The GType. */ -GType gnt_box_get_gtype(void); +GType gnt_box_get_type(void); #define gnt_vbox_new(homo) gnt_box_new(homo, TRUE) #define gnt_hbox_new(homo) gnt_box_new(homo, FALSE)
--- a/finch/libgnt/gntbutton.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntbutton.c Thu Feb 06 19:50:34 2014 +0530 @@ -143,7 +143,7 @@ * GntButton API *****************************************************************************/ GType -gnt_button_get_gtype(void) { +gnt_button_get_type(void) { static GType type = 0; if(type == 0) {
--- a/finch/libgnt/gntbutton.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntbutton.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gnt.h" #include "gntwidget.h" -#define GNT_TYPE_BUTTON (gnt_button_get_gtype()) +#define GNT_TYPE_BUTTON (gnt_button_get_type()) #define GNT_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_BUTTON, GntButton)) #define GNT_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_BUTTON, GntButtonClass)) #define GNT_IS_BUTTON(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_BUTTON)) @@ -81,7 +81,7 @@ * * Returns: GType for Gntbutton */ -GType gnt_button_get_gtype(void); +GType gnt_button_get_type(void); /** * gnt_button_new:
--- a/finch/libgnt/gntcheckbox.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntcheckbox.c Thu Feb 06 19:50:34 2014 +0530 @@ -125,7 +125,7 @@ * GntCheckBox API *****************************************************************************/ GType -gnt_check_box_get_gtype(void) +gnt_check_box_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntcheckbox.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntcheckbox.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gntcolors.h" #include "gntkeys.h" -#define GNT_TYPE_CHECK_BOX (gnt_check_box_get_gtype()) +#define GNT_TYPE_CHECK_BOX (gnt_check_box_get_type()) #define GNT_CHECK_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_CHECK_BOX, GntCheckBox)) #define GNT_CHECK_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_CHECK_BOX, GntCheckBoxClass)) #define GNT_IS_CHECK_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_CHECK_BOX)) @@ -75,7 +75,7 @@ * * Returns: GType for GntCheckBox */ -GType gnt_check_box_get_gtype(void); +GType gnt_check_box_get_type(void); /** * gnt_check_box_new:
--- a/finch/libgnt/gntclipboard.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntclipboard.c Thu Feb 06 19:50:34 2014 +0530 @@ -67,7 +67,7 @@ } GType -gnt_clipboard_get_gtype(void) +gnt_clipboard_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntclipboard.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntclipboard.h Thu Feb 06 19:50:34 2014 +0530 @@ -33,7 +33,7 @@ #include <glib.h> #include <glib-object.h> -#define GNT_TYPE_CLIPBOARD (gnt_clipboard_get_gtype()) +#define GNT_TYPE_CLIPBOARD (gnt_clipboard_get_type()) #define GNT_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_CLIPBOARD, GntClipboard)) #define GNT_CLIPBOARD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_CLIPBOARD, GntClipboardClass)) #define GNT_IS_CLIPBOARD(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_CLIPBOARD)) @@ -67,7 +67,7 @@ * * Returns: GType for GntClipboard. */ -GType gnt_clipboard_get_gtype(void); +GType gnt_clipboard_get_type(void); /** * gnt_clipboard_get_string:
--- a/finch/libgnt/gntcombobox.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntcombobox.c Thu Feb 06 19:50:34 2014 +0530 @@ -321,7 +321,7 @@ * GntComboBox API *****************************************************************************/ GType -gnt_combo_box_get_gtype(void) +gnt_combo_box_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntcombobox.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntcombobox.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gntkeys.h" #include "gntwidget.h" -#define GNT_TYPE_COMBO_BOX (gnt_combo_box_get_gtype()) +#define GNT_TYPE_COMBO_BOX (gnt_combo_box_get_type()) #define GNT_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_COMBO_BOX, GntComboBox)) #define GNT_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_COMBO_BOX, GntComboBoxClass)) #define GNT_IS_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_COMBO_BOX)) @@ -76,7 +76,7 @@ * * Returns: Get the GType for GntComboBox */ -GType gnt_combo_box_get_gtype(void); +GType gnt_combo_box_get_type(void); /** * gnt_combo_box_new:
--- a/finch/libgnt/gntentry.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntentry.c Thu Feb 06 19:50:34 2014 +0530 @@ -1064,7 +1064,7 @@ * GntEntry API *****************************************************************************/ GType -gnt_entry_get_gtype(void) +gnt_entry_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntentry.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntentry.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gntcolors.h" #include "gntkeys.h" -#define GNT_TYPE_ENTRY (gnt_entry_get_gtype()) +#define GNT_TYPE_ENTRY (gnt_entry_get_type()) #define GNT_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_ENTRY, GntEntry)) #define GNT_ENTRY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_ENTRY, GntEntryClass)) #define GNT_IS_ENTRY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_ENTRY)) @@ -112,7 +112,7 @@ * * Returns: GType for GntEntry. */ -GType gnt_entry_get_gtype(void); +GType gnt_entry_get_type(void); /** * gnt_entry_new:
--- a/finch/libgnt/gntfilesel.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntfilesel.c Thu Feb 06 19:50:34 2014 +0530 @@ -554,7 +554,7 @@ * GntFileSel API *****************************************************************************/ GType -gnt_file_sel_get_gtype(void) +gnt_file_sel_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntfilesel.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntfilesel.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gntcolors.h" #include "gntkeys.h" -#define GNT_TYPE_FILE_SEL (gnt_file_sel_get_gtype()) +#define GNT_TYPE_FILE_SEL (gnt_file_sel_get_type()) #define GNT_FILE_SEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_FILE_SEL, GntFileSel)) #define GNT_FILE_SEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_FILE_SEL, GntFileSelClass)) #define GNT_IS_FILE_SEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_FILE_SEL)) @@ -106,7 +106,7 @@ * * Returns: GType for GntFileSel. */ -GType gnt_file_sel_get_gtype(void); +GType gnt_file_sel_get_type(void); /** * gnt_file_sel_new:
--- a/finch/libgnt/gntlabel.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntlabel.c Thu Feb 06 19:50:34 2014 +0530 @@ -157,7 +157,7 @@ * GntLabel API *****************************************************************************/ GType -gnt_label_get_gtype(void) +gnt_label_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntlabel.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntlabel.h Thu Feb 06 19:50:34 2014 +0530 @@ -33,7 +33,7 @@ #include "gntwidget.h" #include "gnttextview.h" -#define GNT_TYPE_LABEL (gnt_label_get_gtype()) +#define GNT_TYPE_LABEL (gnt_label_get_type()) #define GNT_LABEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_LABEL, GntLabel)) #define GNT_LABEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_LABEL, GntLabelClass)) #define GNT_IS_LABEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_LABEL)) @@ -75,7 +75,7 @@ * * Returns: GType for GntLabel. */ -GType gnt_label_get_gtype(void); +GType gnt_label_get_type(void); /** * gnt_label_new:
--- a/finch/libgnt/gntline.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntline.c Thu Feb 06 19:50:34 2014 +0530 @@ -139,7 +139,7 @@ * GntLine API *****************************************************************************/ GType -gnt_line_get_gtype(void) +gnt_line_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntline.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntline.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gntcolors.h" #include "gntkeys.h" -#define GNT_TYPE_LINE (gnt_line_get_gtype()) +#define GNT_TYPE_LINE (gnt_line_get_type()) #define GNT_LINE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_LINE, GntLine)) #define GNT_LINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_LINE, GntLineClass)) #define GNT_IS_LINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_LINE)) @@ -74,7 +74,7 @@ * * Returns: GType for GntLine. */ -GType gnt_line_get_gtype(void); +GType gnt_line_get_type(void); #define gnt_hline_new() gnt_line_new(FALSE) #define gnt_vline_new() gnt_line_new(TRUE)
--- a/finch/libgnt/gntmenu.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntmenu.c Thu Feb 06 19:50:34 2014 +0530 @@ -450,7 +450,7 @@ * GntMenu API *****************************************************************************/ GType -gnt_menu_get_gtype(void) +gnt_menu_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntmenu.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntmenu.h Thu Feb 06 19:50:34 2014 +0530 @@ -33,7 +33,7 @@ #include "gntcolors.h" #include "gntkeys.h" -#define GNT_TYPE_MENU (gnt_menu_get_gtype()) +#define GNT_TYPE_MENU (gnt_menu_get_type()) #define GNT_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENU, GntMenu)) #define GNT_MENU_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENU, GntMenuClass)) #define GNT_IS_MENU(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_MENU)) @@ -97,7 +97,7 @@ * * Returns: The GType for GntMenu. */ -GType gnt_menu_get_gtype(void); +GType gnt_menu_get_type(void); /** * gnt_menu_new:
--- a/finch/libgnt/gntmenuitem.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntmenuitem.c Thu Feb 06 19:50:34 2014 +0530 @@ -71,7 +71,7 @@ * GntMenuItem API *****************************************************************************/ GType -gnt_menuitem_get_gtype(void) +gnt_menuitem_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntmenuitem.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntmenuitem.h Thu Feb 06 19:50:34 2014 +0530 @@ -32,7 +32,7 @@ #include <glib.h> #include <glib-object.h> -#define GNT_TYPE_MENU_ITEM (gnt_menuitem_get_gtype()) +#define GNT_TYPE_MENU_ITEM (gnt_menuitem_get_type()) #define GNT_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENU_ITEM, GntMenuItem)) #define GNT_MENU_ITEM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENU_ITEM, GntMenuItemClass)) #define GNT_IS_MENU_ITEM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_MENU_ITEM)) @@ -94,7 +94,7 @@ * * Returns: GType for GntMenuItem. */ -GType gnt_menuitem_get_gtype(void); +GType gnt_menuitem_get_type(void); /** * gnt_menuitem_new:
--- a/finch/libgnt/gntmenuitemcheck.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntmenuitemcheck.c Thu Feb 06 19:50:34 2014 +0530 @@ -43,7 +43,7 @@ * GntMenuItemCheck API *****************************************************************************/ GType -gnt_menuitem_check_get_gtype(void) +gnt_menuitem_check_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntmenuitemcheck.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntmenuitemcheck.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gntkeys.h" #include "gntmenuitem.h" -#define GNT_TYPE_MENU_ITEM_CHECK (gnt_menuitem_check_get_gtype()) +#define GNT_TYPE_MENU_ITEM_CHECK (gnt_menuitem_check_get_type()) #define GNT_MENU_ITEM_CHECK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_MENU_ITEM_CHECK, GntMenuItemCheck)) #define GNT_MENU_ITEM_CHECK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_MENU_ITEM_CHECK, GntMenuItemCheckClass)) #define GNT_IS_MENU_ITEM_CHECK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_MENU_ITEM_CHECK)) @@ -73,7 +73,7 @@ * * Returns: GType for GntMenuItemCheck. */ -GType gnt_menuitem_check_get_gtype(void); +GType gnt_menuitem_check_get_type(void); /** * gnt_menuitem_check_new:
--- a/finch/libgnt/gntprogressbar.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntprogressbar.c Thu Feb 06 19:50:34 2014 +0530 @@ -143,7 +143,7 @@ } GType -gnt_progress_bar_get_gtype (void) +gnt_progress_bar_get_type (void) { static GType type = 0;
--- a/finch/libgnt/gntprogressbar.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntprogressbar.h Thu Feb 06 19:50:34 2014 +0530 @@ -32,7 +32,7 @@ #include "gnt.h" #include "gntwidget.h" -#define GNT_TYPE_PROGRESS_BAR (gnt_progress_bar_get_gtype ()) +#define GNT_TYPE_PROGRESS_BAR (gnt_progress_bar_get_type ()) #define GNT_PROGRESS_BAR(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GNT_TYPE_PROGRESS_BAR, GntProgressBar)) #define GNT_PROGRESS_BAR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GNT_TYPE_PROGRESS_BAR, GntProgressBarClass)) #define GNT_IS_PROGRESS_BAR(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GNT_TYPE_PROGRESS_BAR)) @@ -69,7 +69,7 @@ * Returns: The GType for GntProrgressBar */ GType -gnt_progress_bar_get_gtype (void); +gnt_progress_bar_get_type (void); /** * gnt_progress_bar_new:
--- a/finch/libgnt/gntslider.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntslider.c Thu Feb 06 19:50:34 2014 +0530 @@ -236,7 +236,7 @@ * GntSlider API *****************************************************************************/ GType -gnt_slider_get_gtype(void) +gnt_slider_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntslider.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntslider.h Thu Feb 06 19:50:34 2014 +0530 @@ -33,7 +33,7 @@ #include "gnt.h" #include "gntlabel.h" -#define GNT_TYPE_SLIDER (gnt_slider_get_gtype()) +#define GNT_TYPE_SLIDER (gnt_slider_get_type()) #define GNT_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_SLIDER, GntSlider)) #define GNT_SLIDER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_SLIDER, GntSliderClass)) #define GNT_IS_SLIDER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_SLIDER)) @@ -84,7 +84,7 @@ * * Since: 2.0.0 (gnt), 2.1.0 (pidgin) */ -GType gnt_slider_get_gtype(void); +GType gnt_slider_get_type(void); #define gnt_hslider_new(max, min) gnt_slider_new(FALSE, max, min) #define gnt_vslider_new(max, min) gnt_slider_new(TRUE, max, min)
--- a/finch/libgnt/gnttextview.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gnttextview.c Thu Feb 06 19:50:34 2014 +0530 @@ -470,7 +470,7 @@ * GntTextView API *****************************************************************************/ GType -gnt_text_view_get_gtype(void) +gnt_text_view_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gnttextview.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gnttextview.h Thu Feb 06 19:50:34 2014 +0530 @@ -34,7 +34,7 @@ #include "gntcolors.h" #include "gntkeys.h" -#define GNT_TYPE_TEXT_VIEW (gnt_text_view_get_gtype()) +#define GNT_TYPE_TEXT_VIEW (gnt_text_view_get_type()) #define GNT_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TEXT_VIEW, GntTextView)) #define GNT_TEXT_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TEXT_VIEW, GntTextViewClass)) #define GNT_IS_TEXT_VIEW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_TEXT_VIEW)) @@ -95,7 +95,7 @@ * * Returns: GType for GntTextView. */ -GType gnt_text_view_get_gtype(void); +GType gnt_text_view_get_type(void); /** * gnt_text_view_new:
--- a/finch/libgnt/gnttree.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gnttree.c Thu Feb 06 19:50:34 2014 +0530 @@ -1142,7 +1142,7 @@ * GntTree API *****************************************************************************/ GType -gnt_tree_get_gtype(void) +gnt_tree_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gnttree.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gnttree.h Thu Feb 06 19:50:34 2014 +0530 @@ -35,7 +35,7 @@ #include "gntkeys.h" #include "gnttextview.h" -#define GNT_TYPE_TREE (gnt_tree_get_gtype()) +#define GNT_TYPE_TREE (gnt_tree_get_type()) #define GNT_TREE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_TREE, GntTree)) #define GNT_TREE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_TREE, GntTreeClass)) #define GNT_IS_TREE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_TREE)) @@ -109,7 +109,7 @@ * * Returns: The GType for GntTree */ -GType gnt_tree_get_gtype(void); +GType gnt_tree_get_type(void); /** * gnt_tree_new:
--- a/finch/libgnt/gntwidget.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntwidget.c Thu Feb 06 19:50:34 2014 +0530 @@ -268,7 +268,7 @@ * GntWidget API *****************************************************************************/ GType -gnt_widget_get_gtype(void) +gnt_widget_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntwidget.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntwidget.h Thu Feb 06 19:50:34 2014 +0530 @@ -35,7 +35,7 @@ #include "gntbindable.h" -#define GNT_TYPE_WIDGET (gnt_widget_get_gtype()) +#define GNT_TYPE_WIDGET (gnt_widget_get_type()) #define GNT_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_WIDGET, GntWidget)) #define GNT_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_WIDGET, GntWidgetClass)) #define GNT_IS_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_WIDGET)) @@ -148,7 +148,7 @@ * * Returns: GType for GntWidget. */ -GType gnt_widget_get_gtype(void); +GType gnt_widget_get_type(void); /** * gnt_widget_destroy:
--- a/finch/libgnt/gntwindow.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntwindow.c Thu Feb 06 19:50:34 2014 +0530 @@ -131,7 +131,7 @@ * GntWindow API *****************************************************************************/ GType -gnt_window_get_gtype(void) +gnt_window_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntwindow.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntwindow.h Thu Feb 06 19:50:34 2014 +0530 @@ -35,7 +35,7 @@ #include "gntkeys.h" #include "gntmenu.h" -#define GNT_TYPE_WINDOW (gnt_window_get_gtype()) +#define GNT_TYPE_WINDOW (gnt_window_get_type()) #define GNT_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_WINDOW, GntWindow)) #define GNT_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_WINDOW, GntWindowClass)) #define GNT_IS_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_WINDOW)) @@ -81,7 +81,7 @@ * * Returns: GType for GntWindow. */ -GType gnt_window_get_gtype(void); +GType gnt_window_get_type(void); #define gnt_vwindow_new(homo) gnt_window_box_new(homo, TRUE) #define gnt_hwindow_new(homo) gnt_window_box_new(homo, FALSE)
--- a/finch/libgnt/gntwm.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntwm.c Thu Feb 06 19:50:34 2014 +0530 @@ -1590,7 +1590,7 @@ * GntWM API *****************************************************************************/ GType -gnt_wm_get_gtype(void) +gnt_wm_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntwm.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntwm.h Thu Feb 06 19:50:34 2014 +0530 @@ -36,7 +36,7 @@ #include <panel.h> #include <time.h> -#define GNT_TYPE_WM (gnt_wm_get_gtype()) +#define GNT_TYPE_WM (gnt_wm_get_type()) #define GNT_WM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_WM, GntWM)) #define GNT_WM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GNT_TYPE_WM, GntWMClass)) #define GNT_IS_WM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_WM)) @@ -197,7 +197,7 @@ * * Returns: GType for GntWM. */ -GType gnt_wm_get_gtype(void); +GType gnt_wm_get_type(void); /** * gnt_wm_add_workspace:
--- a/finch/libgnt/gntws.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntws.c Thu Feb 06 19:50:34 2014 +0530 @@ -160,7 +160,7 @@ } GType -gnt_ws_get_gtype(void) +gnt_ws_get_type(void) { static GType type = 0;
--- a/finch/libgnt/gntws.h Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/gntws.h Thu Feb 06 19:50:34 2014 +0530 @@ -33,7 +33,7 @@ #include <panel.h> -#define GNT_TYPE_WS (gnt_ws_get_gtype()) +#define GNT_TYPE_WS (gnt_ws_get_type()) #define GNT_WS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GNT_TYPE_WS, GntWS)) #define GNT_IS_WS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GNT_TYPE_WS)) #define GNT_IS_WS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GNT_TYPE_WS)) @@ -78,7 +78,7 @@ * * Since: 2.0.0 (gnt), 2.1.0 (pidgin) */ -GType gnt_ws_get_gtype(void); +GType gnt_ws_get_type(void); /** * gnt_ws_new:
--- a/finch/libgnt/wms/irssi.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/wms/irssi.c Thu Feb 06 19:50:34 2014 +0530 @@ -43,7 +43,7 @@ #include "gntwindow.h" #include "gntlabel.h" -#define TYPE_IRSSI (irssi_get_gtype()) +#define TYPE_IRSSI (irssi_get_type()) typedef struct _Irssi { @@ -60,7 +60,7 @@ GntWMClass inherit; } IrssiClass; -GType irssi_get_gtype(void); +GType irssi_get_type(void); void gntwm_init(GntWM **wm); static void (*org_new_window)(GntWM *wm, GntWidget *win); @@ -367,7 +367,7 @@ irssi->buddylistwidth = 0; } -GType irssi_get_gtype(void) +GType irssi_get_type(void) { static GType type = 0;
--- a/finch/libgnt/wms/s.c Thu Feb 06 18:40:31 2014 +0530 +++ b/finch/libgnt/wms/s.c Thu Feb 06 19:50:34 2014 +0530 @@ -13,7 +13,7 @@ #include "buddylist.h" -#define TYPE_S (s_get_gtype()) +#define TYPE_S (s_get_type()) #ifdef _S #undef _S @@ -29,7 +29,7 @@ GntWMClass inherit; } SClass; -GType s_get_gtype(void); +GType s_get_type(void); void gntwm_init(GntWM **wm); static void (*org_new_window)(GntWM *wm, GntWidget *win); @@ -197,7 +197,7 @@ *wm = g_object_new(TYPE_S, NULL); } -GType s_get_gtype(void) +GType s_get_type(void) { static GType type = 0;
--- a/libpurple/account.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/account.c Thu Feb 06 19:50:34 2014 +0530 @@ -2604,7 +2604,7 @@ 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");
--- a/libpurple/accountopt.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/accountopt.c Thu Feb 06 19:50:34 2014 +0530 @@ -278,7 +278,7 @@ } 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);
--- a/libpurple/accountopt.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/accountopt.h Thu Feb 06 19:50:34 2014 +0530 @@ -234,7 +234,7 @@ * * Returns: The account option's type. */ -PurplePrefType purple_account_option_get_type(const PurpleAccountOption *option); +PurplePrefType purple_account_option_get_pref_type(const PurpleAccountOption *option); /** * purple_account_option_get_text:
--- a/libpurple/accounts.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/accounts.c Thu Feb 06 19:50:34 2014 +0530 @@ -341,26 +341,26 @@ 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)) { if (purple_strequal(data, "global")) - purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_USE_GLOBAL); + purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_USE_GLOBAL); else if (purple_strequal(data, "none")) - purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE); + purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_NONE); else if (purple_strequal(data, "http")) - purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_HTTP); + purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_HTTP); else if (purple_strequal(data, "socks4")) - purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_SOCKS4); + purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_SOCKS4); else if (purple_strequal(data, "socks5")) - purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_SOCKS5); + purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_SOCKS5); else if (purple_strequal(data, "tor")) - purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_TOR); + purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_TOR); else if (purple_strequal(data, "envvar")) - purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_USE_ENVVAR); + purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_USE_ENVVAR); else { purple_debug_error("accounts", "Invalid proxy type found when " @@ -403,7 +403,7 @@ } /* If there are no values set then proxy_info NULL */ - if ((purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) && + if ((purple_proxy_info_get_proxy_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) && (purple_proxy_info_get_host(proxy_info) == NULL) && (purple_proxy_info_get_port(proxy_info) == 0) && (purple_proxy_info_get_username(proxy_info) == NULL) &&
--- a/libpurple/dnsquery.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/dnsquery.c Thu Feb 06 19:50:34 2014 +0530 @@ -893,7 +893,7 @@ /* resolve_ip calls purple_dnsquery_resolved */ return FALSE; - proxy_type = purple_proxy_info_get_type( + proxy_type = purple_proxy_info_get_proxy_type( purple_proxy_get_setup(query_data->account)); if (proxy_type == PURPLE_PROXY_TOR) { purple_dnsquery_failed(query_data,
--- a/libpurple/dnssrv.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/dnssrv.c Thu Feb 06 19:50:34 2014 +0530 @@ -739,7 +739,7 @@ g_return_val_if_reached(NULL); } - proxy_type = purple_proxy_info_get_type( + proxy_type = purple_proxy_info_get_proxy_type( purple_proxy_get_setup(account)); if (proxy_type == PURPLE_PROXY_TOR) { purple_debug_info("dnssrv", "Aborting SRV lookup in Tor Proxy mode.\n"); @@ -859,7 +859,7 @@ GError* err = NULL; #endif - proxy_type = purple_proxy_info_get_type( + proxy_type = purple_proxy_info_get_proxy_type( purple_proxy_get_setup(account)); if (proxy_type == PURPLE_PROXY_TOR) { purple_debug_info("dnssrv", "Aborting TXT lookup in Tor Proxy mode.\n"); @@ -1094,7 +1094,7 @@ int -purple_srv_txt_query_get_type(PurpleSrvTxtQueryData *query_data) +purple_srv_txt_query_get_query_type(PurpleSrvTxtQueryData *query_data) { g_return_val_if_fail(query_data != NULL, 0);
--- a/libpurple/dnssrv.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/dnssrv.h Thu Feb 06 19:50:34 2014 +0530 @@ -198,9 +198,9 @@ * * Get the type from a PurpleSrvTxtQueryData (TXT or SRV) * - * Returns: The query. + * Returns: The query type. */ -int purple_srv_txt_query_get_type(PurpleSrvTxtQueryData *query_data); +int purple_srv_txt_query_get_query_type(PurpleSrvTxtQueryData *query_data); G_END_DECLS
--- a/libpurple/http.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/http.c Thu Feb 06 19:50:34 2014 +0530 @@ -731,8 +731,8 @@ proxy = purple_proxy_get_setup(hc->gc ? purple_connection_get_account(hc->gc) : NULL); - proxy_http = (purple_proxy_info_get_type(proxy) == PURPLE_PROXY_HTTP || - purple_proxy_info_get_type(proxy) == PURPLE_PROXY_USE_ENVVAR); + proxy_http = (purple_proxy_info_get_proxy_type(proxy) == PURPLE_PROXY_HTTP || + purple_proxy_info_get_proxy_type(proxy) == PURPLE_PROXY_USE_ENVVAR); /* this is HTTP proxy, but used with tunelling with CONNECT */ if (proxy_http && url->port != 80) proxy_http = FALSE;
--- a/libpurple/notify.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/notify.c Thu Feb 06 19:50:34 2014 +0530 @@ -572,7 +572,7 @@ } PurpleNotifyUserInfoEntryType -purple_notify_user_info_entry_get_type(PurpleNotifyUserInfoEntry *user_info_entry) +purple_notify_user_info_entry_get_entry_type(PurpleNotifyUserInfoEntry *user_info_entry) { g_return_val_if_fail(user_info_entry != NULL, PURPLE_NOTIFY_USER_INFO_ENTRY_PAIR); @@ -580,7 +580,8 @@ } void -purple_notify_user_info_entry_set_type(PurpleNotifyUserInfoEntry *user_info_entry, PurpleNotifyUserInfoEntryType type) +purple_notify_user_info_entry_set_entry_type(PurpleNotifyUserInfoEntry *user_info_entry, + PurpleNotifyUserInfoEntryType type) { g_return_if_fail(user_info_entry != NULL);
--- a/libpurple/notify.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/notify.h Thu Feb 06 19:50:34 2014 +0530 @@ -722,7 +722,8 @@ * * Returns: The PurpleNotifyUserInfoEntryType */ -PurpleNotifyUserInfoEntryType purple_notify_user_info_entry_get_type(PurpleNotifyUserInfoEntry *user_info_entry); +PurpleNotifyUserInfoEntryType purple_notify_user_info_entry_get_entry_type( + PurpleNotifyUserInfoEntry *user_info_entry); /** * purple_notify_user_info_entry_set_type: @@ -731,8 +732,8 @@ * * Set the type of a PurpleNotifyUserInfoEntry */ -void purple_notify_user_info_entry_set_type(PurpleNotifyUserInfoEntry *user_info_entry, - PurpleNotifyUserInfoEntryType type); +void purple_notify_user_info_entry_set_entry_type( + PurpleNotifyUserInfoEntry *user_info_entry, PurpleNotifyUserInfoEntryType type); /** * purple_notify_uri:
--- a/libpurple/pluginpref.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/pluginpref.c Thu Feb 06 19:50:34 2014 +0530 @@ -194,7 +194,7 @@ g_return_if_fail(pref != NULL); g_return_if_fail(pref->name != NULL); - if (purple_prefs_get_type(pref->name) != PURPLE_PREF_INT) + if (purple_prefs_get_pref_type(pref->name) != PURPLE_PREF_INT) { purple_debug_warning("pluginpref", "purple_plugin_pref_set_bounds: %s is not an integer pref\n", @@ -218,7 +218,7 @@ g_return_if_fail(pref != NULL); g_return_if_fail(pref->name != NULL); - if (purple_prefs_get_type(pref->name) != PURPLE_PREF_INT) + if (purple_prefs_get_pref_type(pref->name) != PURPLE_PREF_INT) { purple_debug_warning("pluginpref", "purple_plugin_pref_get_bounds: %s is not an integer pref\n", @@ -231,7 +231,7 @@ } void -purple_plugin_pref_set_type(PurplePluginPref *pref, PurplePluginPrefType type) +purple_plugin_pref_set_pref_type(PurplePluginPref *pref, PurplePluginPrefType type) { g_return_if_fail(pref != NULL); @@ -239,7 +239,7 @@ } PurplePluginPrefType -purple_plugin_pref_get_type(PurplePluginPref *pref) +purple_plugin_pref_get_pref_type(PurplePluginPref *pref) { g_return_val_if_fail(pref != NULL, PURPLE_PLUGIN_PREF_NONE); @@ -251,7 +251,7 @@ { g_return_if_fail(pref != NULL); g_return_if_fail(label != NULL); - g_return_if_fail(choice || purple_prefs_get_type(pref->name) == PURPLE_PREF_INT); + g_return_if_fail(choice || purple_prefs_get_pref_type(pref->name) == PURPLE_PREF_INT); pref->choices = g_list_append(pref->choices, (gpointer)label); pref->choices = g_list_append(pref->choices, choice);
--- a/libpurple/pluginpref.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/pluginpref.h Thu Feb 06 19:50:34 2014 +0530 @@ -218,7 +218,7 @@ * * Set the type of a plugin pref */ -void purple_plugin_pref_set_type(PurplePluginPref *pref, PurplePluginPrefType type); +void purple_plugin_pref_set_pref_type(PurplePluginPref *pref, PurplePluginPrefType type); /** * purple_plugin_pref_get_type: @@ -228,7 +228,7 @@ * * Returns: The type */ -PurplePluginPrefType purple_plugin_pref_get_type(PurplePluginPref *pref); +PurplePluginPrefType purple_plugin_pref_get_pref_type(PurplePluginPref *pref); /** * purple_plugin_pref_add_choice:
--- a/libpurple/plugins/autoaccept.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/autoaccept.c Thu Feb 06 19:50:34 2014 +0530 @@ -274,7 +274,7 @@ pref = purple_plugin_pref_new_with_name_and_label(PREF_STRANGER, _("When a file-transfer request arrives from a user who is\n" "*not* on your buddy list:")); - purple_plugin_pref_set_type(pref, PURPLE_PLUGIN_PREF_CHOICE); + purple_plugin_pref_set_pref_type(pref, PURPLE_PLUGIN_PREF_CHOICE); purple_plugin_pref_add_choice(pref, _("Ask"), GINT_TO_POINTER(FT_ASK)); purple_plugin_pref_add_choice(pref, _("Auto Accept"), GINT_TO_POINTER(FT_ACCEPT)); purple_plugin_pref_add_choice(pref, _("Auto Reject"), GINT_TO_POINTER(FT_REJECT));
--- a/libpurple/plugins/perl/common/AccountOpts.xs Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/perl/common/AccountOpts.xs Thu Feb 06 19:50:34 2014 +0530 @@ -98,7 +98,7 @@ } Purple::PrefType -purple_account_option_get_type(option) +purple_account_option_get_pref_type(option) Purple::Account::Option option gboolean
--- a/libpurple/plugins/perl/common/PluginPref.xs Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/perl/common/PluginPref.xs Thu Feb 06 19:50:34 2014 +0530 @@ -112,7 +112,7 @@ Purple::PluginPref pref Purple::PluginPrefType -purple_plugin_pref_get_type(pref) +purple_plugin_pref_get_pref_type(pref) Purple::PluginPref pref Purple::PluginPref @@ -170,7 +170,7 @@ const char *name void -purple_plugin_pref_set_type(pref, type) +purple_plugin_pref_set_pref_type(pref, type) Purple::PluginPref pref Purple::PluginPrefType type PREINIT: @@ -185,4 +185,4 @@ } else if (type == 3) { gpp_type = PURPLE_PLUGIN_PREF_STRING_FORMAT; } - purple_plugin_pref_set_type(pref, gpp_type); + purple_plugin_pref_set_pref_type(pref, gpp_type);
--- a/libpurple/plugins/perl/common/Prefs.xs Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/perl/common/Prefs.xs Thu Feb 06 19:50:34 2014 +0530 @@ -153,7 +153,7 @@ } Purple::PrefType -purple_prefs_get_type(name) +purple_prefs_get_pref_type(name) const char *name gboolean
--- a/libpurple/plugins/perl/common/Proxy.xs Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/perl/common/Proxy.xs Thu Feb 06 19:50:34 2014 +0530 @@ -44,7 +44,7 @@ Purple::ProxyInfo info Purple::ProxyType -purple_proxy_info_get_type(info) +purple_proxy_info_get_proxy_type(info) Purple::ProxyInfo info const char * @@ -70,7 +70,7 @@ int port void -purple_proxy_info_set_type(info, type) +purple_proxy_info_set_proxy_type(info, type) Purple::ProxyInfo info Purple::ProxyType type
--- a/libpurple/plugins/perl/common/Request.xs Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/perl/common/Request.xs Thu Feb 06 19:50:34 2014 +0530 @@ -556,11 +556,11 @@ Purple::Request::Field field Purple::RequestFieldType -purple_request_field_get_type(field) +purple_request_field_get_field_type(field) Purple::Request::Field field const char * -purple_request_field_get_type_hint(field) +purple_request_field_get_field_type_hint(field) Purple::Request::Field field gboolean
--- a/libpurple/plugins/perl/common/SavedStatuses.xs Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/perl/common/SavedStatuses.xs Thu Feb 06 19:50:34 2014 +0530 @@ -4,7 +4,7 @@ * type I get errors from gcc. One way about ignoring types in a cast, and the * other about assigning to read-only variables. const Purple::StatusType -purple_savedstatus_substatus_get_type(substatus) +purple_savedstatus_substatus_get_status_type(substatus) const Purple::SavedStatus::Sub substatus */ @@ -22,7 +22,7 @@ const char *title void -purple_savedstatus_set_type(status, type) +purple_savedstatus_set_primitive_type(status, type) Purple::SavedStatus status Purple::StatusPrimitive type @@ -88,7 +88,7 @@ const Purple::SavedStatus saved_status Purple::StatusPrimitive -purple_savedstatus_get_type(saved_status) +purple_savedstatus_get_primitive_type(saved_status) const Purple::SavedStatus saved_status const char *
--- a/libpurple/plugins/pluginpref_example.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/pluginpref_example.c Thu Feb 06 19:50:34 2014 +0530 @@ -54,7 +54,7 @@ ppref = purple_plugin_pref_new_with_name_and_label( "/plugins/core/pluginpref_example/int_choice", "integer choice"); - purple_plugin_pref_set_type(ppref, PURPLE_PLUGIN_PREF_CHOICE); + purple_plugin_pref_set_pref_type(ppref, PURPLE_PLUGIN_PREF_CHOICE); purple_plugin_pref_add_choice(ppref, "One", GINT_TO_POINTER(1)); purple_plugin_pref_add_choice(ppref, "Two", GINT_TO_POINTER(2)); purple_plugin_pref_add_choice(ppref, "Four", GINT_TO_POINTER(4)); @@ -88,7 +88,7 @@ ppref = purple_plugin_pref_new_with_name_and_label( "/plugins/core/pluginpref_example/string_choice", "string choice"); - purple_plugin_pref_set_type(ppref, PURPLE_PLUGIN_PREF_CHOICE); + purple_plugin_pref_set_pref_type(ppref, PURPLE_PLUGIN_PREF_CHOICE); purple_plugin_pref_add_choice(ppref, "red", "red"); purple_plugin_pref_add_choice(ppref, "orange", "orange"); purple_plugin_pref_add_choice(ppref, "yellow", "yellow");
--- a/libpurple/plugins/tcl/tcl_cmds.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/plugins/tcl/tcl_cmds.c Thu Feb 06 19:50:34 2014 +0530 @@ -1058,7 +1058,7 @@ Tcl_WrongNumArgs(interp, 1, objv, "path"); return TCL_ERROR; } - preftype = purple_prefs_get_type(Tcl_GetString(objv[2])); + preftype = purple_prefs_get_pref_type(Tcl_GetString(objv[2])); switch (preftype) { case PURPLE_PREF_NONE: Tcl_SetObjResult(interp, @@ -1099,7 +1099,7 @@ Tcl_WrongNumArgs(interp, 1, objv, "path value"); return TCL_ERROR; } - preftype = purple_prefs_get_type(Tcl_GetString(objv[2])); + preftype = purple_prefs_get_pref_type(Tcl_GetString(objv[2])); switch (preftype) { case PURPLE_PREF_NONE: Tcl_SetObjResult(interp, @@ -1139,7 +1139,7 @@ Tcl_WrongNumArgs(interp, 1, objv, "path"); return TCL_ERROR; } - preftype = purple_prefs_get_type(Tcl_GetString(objv[2])); + preftype = purple_prefs_get_pref_type(Tcl_GetString(objv[2])); switch (preftype) { case PURPLE_PREF_NONE: Tcl_SetObjResult(interp, Tcl_NewStringObj("none", -1)); @@ -1376,7 +1376,7 @@ return TCL_ERROR; result = Tcl_NewListObj(0, NULL); Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(purple_savedstatus_get_title(saved_status), -1)); - Tcl_ListObjAppendElement(interp, result, Tcl_NewIntObj(purple_savedstatus_get_type(saved_status))); + Tcl_ListObjAppendElement(interp, result, Tcl_NewIntObj(purple_savedstatus_get_primitive_type(saved_status))); Tcl_ListObjAppendElement(interp, result, Tcl_NewStringObj(purple_savedstatus_get_message(saved_status), -1)); Tcl_SetObjResult(interp,result); break;
--- a/libpurple/prefs.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/prefs.c Thu Feb 06 19:50:34 2014 +0530 @@ -955,7 +955,7 @@ } PurplePrefType -purple_prefs_get_type(const char *name) +purple_prefs_get_pref_type(const char *name) { struct purple_pref *pref = find_pref(name);
--- a/libpurple/prefs.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/prefs.h Thu Feb 06 19:50:34 2014 +0530 @@ -283,7 +283,7 @@ * * Returns: The type of the pref */ -PurplePrefType purple_prefs_get_type(const char *name); +PurplePrefType purple_prefs_get_pref_type(const char *name); /** * purple_prefs_get_bool:
--- a/libpurple/protocols/bonjour/bonjour_ft.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/protocols/bonjour/bonjour_ft.c Thu Feb 06 19:50:34 2014 +0530 @@ -1054,7 +1054,7 @@ snprintf(p, 3, "%02x", hashval[i]); xf->proxy_info = purple_proxy_info_new(); - purple_proxy_info_set_type(xf->proxy_info, PURPLE_PROXY_SOCKS5); + purple_proxy_info_set_proxy_type(xf->proxy_info, PURPLE_PROXY_SOCKS5); purple_proxy_info_set_host(xf->proxy_info, xf->proxy_host); purple_proxy_info_set_port(xf->proxy_info, xf->proxy_port); xf->proxy_connection = purple_proxy_connect_socks5_account(
--- a/libpurple/protocols/bonjour/jabber.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/protocols/bonjour/jabber.c Thu Feb 06 19:50:34 2014 +0530 @@ -1045,7 +1045,7 @@ proxy_info = purple_proxy_info_new(); purple_account_set_proxy_info(jdata->account, proxy_info); } - purple_proxy_info_set_type(proxy_info, PURPLE_PROXY_NONE); + purple_proxy_info_set_proxy_type(proxy_info, PURPLE_PROXY_NONE); connect_data = purple_proxy_connect( purple_account_get_connection(jdata->account),
--- a/libpurple/protocols/gg/deprecated.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/protocols/gg/deprecated.c Thu Feb 06 19:50:34 2014 +0530 @@ -35,7 +35,7 @@ { PurpleProxyInfo *gpi = purple_proxy_get_setup(purple_connection_get_account(gc)); - if ((purple_proxy_info_get_type(gpi) != PURPLE_PROXY_NONE) && + if ((purple_proxy_info_get_proxy_type(gpi) != PURPLE_PROXY_NONE) && (purple_proxy_info_get_host(gpi) == NULL || purple_proxy_info_get_port(gpi) <= 0)) { @@ -47,7 +47,7 @@ return FALSE; } - if (purple_proxy_info_get_type(gpi) == PURPLE_PROXY_NONE) { + if (purple_proxy_info_get_proxy_type(gpi) == PURPLE_PROXY_NONE) { gg_proxy_enabled = 0; return TRUE; }
--- a/libpurple/protocols/gg/validator.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/protocols/gg/validator.c Thu Feb 06 19:50:34 2014 +0530 @@ -40,7 +40,7 @@ const char *value; g_return_val_if_fail(field != NULL, FALSE); - g_return_val_if_fail(purple_request_field_get_type(field) == + g_return_val_if_fail(purple_request_field_get_field_type(field) == PURPLE_REQUEST_FIELD_STRING, FALSE); value = purple_request_field_string_get_value(field); @@ -60,7 +60,7 @@ const char *value; g_return_val_if_fail(field != NULL, FALSE); - g_return_val_if_fail(purple_request_field_get_type(field) == + g_return_val_if_fail(purple_request_field_get_field_type(field) == PURPLE_REQUEST_FIELD_STRING, FALSE); value = purple_request_field_string_get_value(field); @@ -81,9 +81,9 @@ g_return_val_if_fail(field != NULL, FALSE); g_return_val_if_fail(field2 != NULL, FALSE); - g_return_val_if_fail(purple_request_field_get_type(field) == + g_return_val_if_fail(purple_request_field_get_field_type(field) == PURPLE_REQUEST_FIELD_STRING, FALSE); - g_return_val_if_fail(purple_request_field_get_type(field2) == + g_return_val_if_fail(purple_request_field_get_field_type(field2) == PURPLE_REQUEST_FIELD_STRING, FALSE); value1 = purple_request_field_string_get_value(field);
--- a/libpurple/protocols/jabber/si.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/protocols/jabber/si.c Thu Feb 06 19:50:34 2014 +0530 @@ -288,7 +288,7 @@ char *dstaddr, *hash; PurpleAccount *account; jsx->gpi = purple_proxy_info_new(); - purple_proxy_info_set_type(jsx->gpi, PURPLE_PROXY_SOCKS5); + purple_proxy_info_set_proxy_type(jsx->gpi, PURPLE_PROXY_SOCKS5); purple_proxy_info_set_host(jsx->gpi, streamhost->host); purple_proxy_info_set_port(jsx->gpi, streamhost->port); @@ -962,7 +962,7 @@ /* TODO: This should probably be done with an account option instead of * piggy-backing on the TOR proxy type. */ - proxy_type = purple_proxy_info_get_type( + proxy_type = purple_proxy_info_get_proxy_type( purple_proxy_get_setup(purple_connection_get_account(jsx->js->gc))); if (proxy_type == PURPLE_PROXY_TOR) { purple_debug_info("jabber", "Skipping attempting local streamhost.\n");
--- a/libpurple/protocols/msn/msn.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/protocols/msn/msn.c Thu Feb 06 19:50:34 2014 +0530 @@ -491,7 +491,7 @@ others; others = g_list_next(others)) { PurpleRequestField *field = others->data; - if (purple_request_field_get_type(field) != PURPLE_REQUEST_FIELD_BOOLEAN) + if (purple_request_field_get_field_type(field) != PURPLE_REQUEST_FIELD_BOOLEAN) continue; if (purple_request_field_bool_get_value(field)) { const char *id = purple_request_field_get_id(field);
--- a/libpurple/protocols/sametime/sametime.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/protocols/sametime/sametime.c Thu Feb 06 19:50:34 2014 +0530 @@ -5181,7 +5181,7 @@ pref = purple_plugin_pref_new_with_name(MW_PRPL_OPT_BLIST_ACTION); purple_plugin_pref_set_label(pref, _("Buddy List Storage Mode")); - purple_plugin_pref_set_type(pref, PURPLE_PLUGIN_PREF_CHOICE); + purple_plugin_pref_set_pref_type(pref, PURPLE_PLUGIN_PREF_CHOICE); purple_plugin_pref_add_choice(pref, _("Local Buddy List Only"), GINT_TO_POINTER(blist_choice_LOCAL)); purple_plugin_pref_add_choice(pref, _("Merge List from Server"),
--- a/libpurple/protocols/yahoo/util.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/protocols/yahoo/util.c Thu Feb 06 19:50:34 2014 +0530 @@ -45,7 +45,7 @@ else ppi = purple_proxy_get_setup(NULL); - type = purple_proxy_info_get_type(ppi); + type = purple_proxy_info_get_proxy_type(ppi); return (type == PURPLE_PROXY_HTTP || type == PURPLE_PROXY_USE_ENVVAR); }
--- a/libpurple/proxy.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/proxy.c Thu Feb 06 19:50:34 2014 +0530 @@ -127,7 +127,7 @@ } void -purple_proxy_info_set_type(PurpleProxyInfo *info, PurpleProxyType type) +purple_proxy_info_set_proxy_type(PurpleProxyInfo *info, PurpleProxyType type) { g_return_if_fail(info != NULL); @@ -170,7 +170,7 @@ } PurpleProxyType -purple_proxy_info_get_type(const PurpleProxyInfo *info) +purple_proxy_info_get_proxy_type(const PurpleProxyInfo *info) { g_return_val_if_fail(info != NULL, PURPLE_PROXY_NONE); @@ -507,7 +507,7 @@ } else specific = proxy_list; - purple_proxy_info_set_type(&info, PURPLE_PROXY_HTTP); + purple_proxy_info_set_proxy_type(&info, PURPLE_PROXY_HTTP); _proxy_fill_hostinfo(&info, specific, 80); /* TODO: is there a way to set the username/password? */ purple_proxy_info_set_username(&info, NULL); @@ -525,7 +525,7 @@ *tmp = '\0'; /* specific now points the proxy server (and port) */ - purple_proxy_info_set_type(&info, PURPLE_PROXY_SOCKS5); + purple_proxy_info_set_proxy_type(&info, PURPLE_PROXY_SOCKS5); _proxy_fill_hostinfo(&info, specific, 1080); /* TODO: is there a way to set the username/password? */ purple_proxy_info_set_username(&info, NULL); @@ -539,7 +539,7 @@ purple_debug_info("proxy", "Windows Proxy Settings: No supported proxy specified.\n"); - purple_proxy_info_set_type(&info, PURPLE_PROXY_NONE); + purple_proxy_info_set_proxy_type(&info, PURPLE_PROXY_NONE); } } @@ -549,7 +549,7 @@ g_free(proxy_list); } else { purple_debug_info("proxy", "No Windows proxy set.\n"); - purple_proxy_info_set_type(&info, PURPLE_PROXY_NONE); + purple_proxy_info_set_proxy_type(&info, PURPLE_PROXY_NONE); } if (ie_proxy_config.lpszAutoConfigUrl) @@ -2194,7 +2194,7 @@ return; } - switch (purple_proxy_info_get_type(connect_data->gpi)) { + switch (purple_proxy_info_get_proxy_type(connect_data->gpi)) { case PURPLE_PROXY_NONE: proxy_connect_none(connect_data, addr, addrlen); break; @@ -2259,12 +2259,12 @@ static PurpleProxyInfo *tmp_none_proxy_info = NULL; if (!tmp_none_proxy_info) { tmp_none_proxy_info = purple_proxy_info_new(); - purple_proxy_info_set_type(tmp_none_proxy_info, PURPLE_PROXY_NONE); + purple_proxy_info_set_proxy_type(tmp_none_proxy_info, PURPLE_PROXY_NONE); } if (account && purple_account_get_proxy_info(account) != NULL) { gpi = purple_account_get_proxy_info(account); - if (purple_proxy_info_get_type(gpi) == PURPLE_PROXY_USE_GLOBAL) + if (purple_proxy_info_get_proxy_type(gpi) == PURPLE_PROXY_USE_GLOBAL) gpi = NULL; } if (gpi == NULL) { @@ -2274,7 +2274,7 @@ gpi = purple_global_proxy_get_info(); } - if (purple_proxy_info_get_type(gpi) == PURPLE_PROXY_USE_ENVVAR) { + if (purple_proxy_info_get_proxy_type(gpi) == PURPLE_PROXY_USE_ENVVAR) { if ((tmp = g_getenv("HTTP_PROXY")) != NULL || (tmp = g_getenv("http_proxy")) != NULL || (tmp = g_getenv("HTTPPROXY")) != NULL) @@ -2350,7 +2350,7 @@ connect_data->gpi = purple_proxy_get_setup(account); connect_data->account = account; - if ((purple_proxy_info_get_type(connect_data->gpi) != PURPLE_PROXY_NONE) && + if ((purple_proxy_info_get_proxy_type(connect_data->gpi) != PURPLE_PROXY_NONE) && (purple_proxy_info_get_host(connect_data->gpi) == NULL || purple_proxy_info_get_port(connect_data->gpi) <= 0)) { @@ -2362,7 +2362,7 @@ return NULL; } - switch (purple_proxy_info_get_type(connect_data->gpi)) + switch (purple_proxy_info_get_proxy_type(connect_data->gpi)) { case PURPLE_PROXY_NONE: break; @@ -2378,7 +2378,7 @@ default: purple_debug_error("proxy", "Invalid Proxy type (%d) specified.\n", - purple_proxy_info_get_type(connect_data->gpi)); + purple_proxy_info_get_proxy_type(connect_data->gpi)); purple_proxy_connect_data_destroy(connect_data); return NULL; } @@ -2421,7 +2421,7 @@ connect_data->gpi = purple_proxy_get_setup(account); connect_data->account = account; - if ((purple_proxy_info_get_type(connect_data->gpi) != PURPLE_PROXY_NONE) && + if ((purple_proxy_info_get_proxy_type(connect_data->gpi) != PURPLE_PROXY_NONE) && (purple_proxy_info_get_host(connect_data->gpi) == NULL || purple_proxy_info_get_port(connect_data->gpi) <= 0)) { @@ -2433,7 +2433,7 @@ return NULL; } - switch (purple_proxy_info_get_type(connect_data->gpi)) + switch (purple_proxy_info_get_proxy_type(connect_data->gpi)) { case PURPLE_PROXY_NONE: break; @@ -2444,12 +2444,12 @@ case PURPLE_PROXY_TOR: case PURPLE_PROXY_USE_ENVVAR: purple_debug_info("proxy", "Ignoring Proxy type (%d) for UDP.\n", - purple_proxy_info_get_type(connect_data->gpi)); + purple_proxy_info_get_proxy_type(connect_data->gpi)); break; default: purple_debug_error("proxy", "Invalid Proxy type (%d) specified.\n", - purple_proxy_info_get_type(connect_data->gpi)); + purple_proxy_info_get_proxy_type(connect_data->gpi)); purple_proxy_connect_data_destroy(connect_data); return NULL; } @@ -2607,7 +2607,7 @@ else proxytype = -1; - purple_proxy_info_set_type(info, proxytype); + purple_proxy_info_set_proxy_type(info, proxytype); } else if (purple_strequal(name, "/purple/proxy/host")) purple_proxy_info_set_host(info, value); else if (purple_strequal(name, "/purple/proxy/port"))
--- a/libpurple/proxy.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/proxy.h Thu Feb 06 19:50:34 2014 +0530 @@ -100,7 +100,7 @@ * * Sets the type of proxy. */ -void purple_proxy_info_set_type(PurpleProxyInfo *info, PurpleProxyType type); +void purple_proxy_info_set_proxy_type(PurpleProxyInfo *info, PurpleProxyType type); /** * purple_proxy_info_set_host: @@ -146,7 +146,7 @@ * * Returns: The type. */ -PurpleProxyType purple_proxy_info_get_type(const PurpleProxyInfo *info); +PurpleProxyType purple_proxy_info_get_proxy_type(const PurpleProxyInfo *info); /** * purple_proxy_info_get_host:
--- a/libpurple/request.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/request.c Thu Feb 06 19:50:34 2014 +0530 @@ -1057,7 +1057,7 @@ } PurpleRequestFieldType -purple_request_field_get_type(const PurpleRequestField *field) +purple_request_field_get_field_type(const PurpleRequestField *field) { g_return_val_if_fail(field != NULL, PURPLE_REQUEST_FIELD_NONE); @@ -1097,7 +1097,7 @@ } const char * -purple_request_field_get_type_hint(const PurpleRequestField *field) +purple_request_field_get_field_type_hint(const PurpleRequestField *field) { g_return_val_if_fail(field != NULL, NULL); @@ -1125,7 +1125,7 @@ { g_return_val_if_fail(field != NULL, FALSE); - switch (purple_request_field_get_type(field)) + switch (purple_request_field_get_field_type(field)) { case PURPLE_REQUEST_FIELD_STRING: return (purple_request_field_string_get_value(field) != NULL &&
--- a/libpurple/request.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/request.h Thu Feb 06 19:50:34 2014 +0530 @@ -927,7 +927,7 @@ * * Returns: The field's type. */ -PurpleRequestFieldType purple_request_field_get_type(const PurpleRequestField *field); +PurpleRequestFieldType purple_request_field_get_field_type(const PurpleRequestField *field); /** * purple_request_field_get_group: @@ -977,7 +977,7 @@ * * Returns: The field's type hint. */ -const char *purple_request_field_get_type_hint(const PurpleRequestField *field); +const char *purple_request_field_get_field_type_hint(const PurpleRequestField *field); /** * purple_request_field_get_tooltip:
--- a/libpurple/savedstatuses.c Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/savedstatuses.c Thu Feb 06 19:50:34 2014 +0530 @@ -594,7 +594,7 @@ } void -purple_savedstatus_set_type(PurpleSavedStatus *status, PurpleStatusPrimitive type) +purple_savedstatus_set_primitive_type(PurpleSavedStatus *status, PurpleStatusPrimitive type) { g_return_if_fail(status != NULL); @@ -875,7 +875,7 @@ if (!idleaway) purple_idle_touch(); - if (idleaway && (purple_savedstatus_get_type(old) != PURPLE_STATUS_AVAILABLE)) + if (idleaway && (purple_savedstatus_get_primitive_type(old) != PURPLE_STATUS_AVAILABLE)) /* Our global status is already "away," so don't change anything */ return; @@ -1005,7 +1005,7 @@ if ((message == NULL) || (*message == '\0')) { PurpleStatusPrimitive primitive; - primitive = purple_savedstatus_get_type(saved_status); + primitive = purple_savedstatus_get_primitive_type(saved_status); return purple_primitive_get_name_from_type(primitive); } else @@ -1028,7 +1028,7 @@ } PurpleStatusPrimitive -purple_savedstatus_get_type(const PurpleSavedStatus *saved_status) +purple_savedstatus_get_primitive_type(const PurpleSavedStatus *saved_status) { g_return_val_if_fail(saved_status != NULL, PURPLE_STATUS_OFFLINE); @@ -1080,7 +1080,7 @@ } const PurpleStatusType * -purple_savedstatus_substatus_get_type(const PurpleSavedStatusSub *substatus) +purple_savedstatus_substatus_get_status_type(const PurpleSavedStatusSub *substatus) { g_return_val_if_fail(substatus != NULL, NULL); @@ -1183,7 +1183,7 @@ } GType -purple_savedstatus_get_g_type(void) +purple_savedstatus_get_type(void) { static GType type = 0;
--- a/libpurple/savedstatuses.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/savedstatuses.h Thu Feb 06 19:50:34 2014 +0530 @@ -29,7 +29,7 @@ #ifndef _PURPLE_SAVEDSTATUSES_H_ #define _PURPLE_SAVEDSTATUSES_H_ -#define PURPLE_TYPE_SAVEDSTATUS (purple_savedstatus_get_g_type()) +#define PURPLE_TYPE_SAVEDSTATUS (purple_savedstatus_get_type()) /** * PurpleSavedStatus: @@ -73,14 +73,14 @@ /*@{*/ /** - * purple_savedstatus_get_g_type: + * purple_savedstatus_get_type: * * Returns: The #GType for the #PurpleSavedStatus boxed structure. */ /* TODO Boxing of PurpleSavedStatus is a temporary solution to having a GType * for saved statuses. This should rather be a GObject instead of a GBoxed. */ -GType purple_savedstatus_get_g_type(void); +GType purple_savedstatus_get_type(void); /** * purple_savedstatus_new: @@ -109,13 +109,13 @@ const char *title); /** - * purple_savedstatus_set_type: + * purple_savedstatus_set_primitive_type: * @status: The saved status. * @type: The type of saved status. * * Set the type for the given saved status. */ -void purple_savedstatus_set_type(PurpleSavedStatus *status, +void purple_savedstatus_set_primitive_type(PurpleSavedStatus *status, PurpleStatusPrimitive type); /** @@ -133,7 +133,7 @@ * purple_savedstatus_set_substatus: * @status: The saved status. * @account: The account. - * @type: The status type for the account in the staved + * @type: The status type for the account in the saved * status. * @message: The message for the account in the substatus. * @@ -339,14 +339,14 @@ const char *purple_savedstatus_get_title(const PurpleSavedStatus *saved_status); /** - * purple_savedstatus_get_type: + * purple_savedstatus_get_primitive_type: * @saved_status: The saved status. * * Return the type of a given saved status. * * Returns: The primitive type. */ -PurpleStatusPrimitive purple_savedstatus_get_type(const PurpleSavedStatus *saved_status); +PurpleStatusPrimitive purple_savedstatus_get_primitive_type(const PurpleSavedStatus *saved_status); /** * purple_savedstatus_get_message: @@ -408,14 +408,15 @@ const PurpleAccount *account); /** - * purple_savedstatus_substatus_get_type: + * purple_savedstatus_substatus_get_status_type: * @substatus: The substatus. * * Get the status type of a given substatus. * * Returns: The status type. */ -const PurpleStatusType *purple_savedstatus_substatus_get_type(const PurpleSavedStatusSub *substatus); +const PurpleStatusType *purple_savedstatus_substatus_get_status_type( + const PurpleSavedStatusSub *substatus); /** * purple_savedstatus_substatus_get_message:
--- a/libpurple/status.h Thu Feb 06 18:40:31 2014 +0530 +++ b/libpurple/status.h Thu Feb 06 19:50:34 2014 +0530 @@ -592,7 +592,7 @@ * Returns the status's type ID. * * This is a convenience method for - * purple_status_type_get_id(purple_status_get_type(status)). + * purple_status_type_get_id(purple_status_get_status_type(status)). * * Returns: The status's ID. */ @@ -605,7 +605,7 @@ * Returns the status's name. * * This is a convenience method for - * purple_status_type_get_name(purple_status_get_type(status)). + * purple_status_type_get_name(purple_status_get_status_type(status)). * * Returns: The status's name. */ @@ -618,7 +618,7 @@ * Returns whether or not a status is independent. * * This is a convenience method for - * purple_status_type_is_independent(purple_status_get_type(status)). + * purple_status_type_is_independent(purple_status_get_status_type(status)). * * Returns: TRUE if the status is independent, or FALSE otherwise. */ @@ -631,7 +631,7 @@ * Returns whether or not a status is exclusive. * * This is a convenience method for - * purple_status_type_is_exclusive(purple_status_get_type(status)). + * purple_status_type_is_exclusive(purple_status_get_status_type(status)). * * Returns: TRUE if the status is exclusive, FALSE otherwise. */ @@ -646,7 +646,7 @@ * Available statuses are online and possibly invisible, but not away or idle. * * This is a convenience method for - * purple_status_type_is_available(purple_status_get_type(status)). + * purple_status_type_is_available(purple_status_get_status_type(status)). * * Returns: TRUE if the status is available, or FALSE otherwise. */
--- a/pidgin/gtkaccount.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/gtkaccount.c Thu Feb 06 19:50:34 2014 +0530 @@ -938,7 +938,7 @@ option = (PurpleAccountOption *)l->data; opt_entry = g_new0(ProtocolOptEntry, 1); - opt_entry->type = purple_account_option_get_type(option); + opt_entry->type = purple_account_option_get_pref_type(option); opt_entry->setting = g_strdup(purple_account_option_get_setting(option)); switch (opt_entry->type) @@ -1273,7 +1273,7 @@ const char *value; int int_val; - dialog->new_proxy_type = purple_proxy_info_get_type(proxy_info); + dialog->new_proxy_type = purple_proxy_info_get_proxy_type(proxy_info); if ((value = purple_proxy_info_get_host(proxy_info)) != NULL) gtk_entry_set_text(GTK_ENTRY(dialog->proxy_host_entry), value); @@ -1608,7 +1608,7 @@ } /* Set the proxy info type. */ - purple_proxy_info_set_type(proxy_info, dialog->new_proxy_type); + purple_proxy_info_set_proxy_type(proxy_info, dialog->new_proxy_type); /* Host */ value = gtk_entry_get_text(GTK_ENTRY(dialog->proxy_host_entry)); @@ -1643,7 +1643,7 @@ purple_proxy_info_set_password(proxy_info, NULL); /* If there are no values set then proxy_info NULL */ - if ((purple_proxy_info_get_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) && + if ((purple_proxy_info_get_proxy_type(proxy_info) == PURPLE_PROXY_USE_GLOBAL) && (purple_proxy_info_get_host(proxy_info) == NULL) && (purple_proxy_info_get_port(proxy_info) == 0) && (purple_proxy_info_get_username(proxy_info) == NULL) &&
--- a/pidgin/gtkblist.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/gtkblist.c Thu Feb 06 19:50:34 2014 +0530 @@ -638,7 +638,7 @@ 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));
--- a/pidgin/gtkdocklet.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/gtkdocklet.c Thu Feb 06 19:50:34 2014 +0530 @@ -239,7 +239,7 @@ newflags |= PIDGIN_DOCKLET_EMAIL_PENDING; } - newstatus = purple_savedstatus_get_type(saved_status); + newstatus = purple_savedstatus_get_primitive_type(saved_status); /* update the icon if we changed status */ if (status != newstatus || flags != newflags) { @@ -411,7 +411,7 @@ PurpleSavedStatus *saved_status; saved_status = purple_savedstatus_get_current(); - if (purple_savedstatus_get_type(saved_status) == PURPLE_STATUS_AVAILABLE) + if (purple_savedstatus_get_primitive_type(saved_status) == PURPLE_STATUS_AVAILABLE) saved_status = purple_savedstatus_new(NULL, PURPLE_STATUS_AWAY); pidgin_status_editor_show(FALSE, @@ -449,7 +449,7 @@ for (; iter != NULL; iter = iter->next) { PurpleSavedStatus *ss = iter->data; - if ((purple_savedstatus_get_type(ss) == primitive) && purple_savedstatus_is_transient(ss) && + if ((purple_savedstatus_get_primitive_type(ss) == primitive) && purple_savedstatus_is_transient(ss) && purple_savedstatus_has_substatuses(ss)) { gboolean found = FALSE; @@ -458,7 +458,7 @@ PurpleAccount *acct = tmp->data; PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct); if (sub) { - const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub); + const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_status_type(sub); const char *subtype_status_id = purple_status_type_get_id(sub_type); if (subtype_status_id && !strcmp(subtype_status_id, purple_status_type_get_id(status_type))) @@ -609,7 +609,7 @@ time_t creation_time = purple_savedstatus_get_creation_time(saved_status); new_menu_item_with_status_icon(submenu, purple_savedstatus_get_title(saved_status), - purple_savedstatus_get_type(saved_status), G_CALLBACK(activate_saved_status_cb), + purple_savedstatus_get_primitive_type(saved_status), G_CALLBACK(activate_saved_status_cb), GINT_TO_POINTER(creation_time), 0, 0, NULL); } g_list_free(popular_statuses);
--- a/pidgin/gtkpluginpref.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/gtkpluginpref.c Thu Feb 06 19:50:34 2014 +0530 @@ -67,7 +67,7 @@ pref_label = purple_plugin_pref_get_label(pref); format = purple_plugin_pref_get_format_type(pref); - switch(purple_plugin_pref_get_type(pref)) { + switch(purple_plugin_pref_get_pref_type(pref)) { case PURPLE_PLUGIN_PREF_CHOICE: gtk_label = pidgin_prefs_dropdown_from_list(parent, pref_label, PURPLE_PREF_STRING, pref_name, @@ -160,7 +160,7 @@ pref_name = purple_plugin_pref_get_name(pref); pref_label = purple_plugin_pref_get_label(pref); - switch(purple_plugin_pref_get_type(pref)) { + switch(purple_plugin_pref_get_pref_type(pref)) { case PURPLE_PLUGIN_PREF_CHOICE: gtk_label = pidgin_prefs_dropdown_from_list(parent, pref_label, PURPLE_PREF_INT, pref_name, purple_plugin_pref_get_choices(pref)); @@ -219,7 +219,7 @@ 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) { make_info_pref(parent, pref); } else { parent = pidgin_make_frame(ret, label); @@ -229,7 +229,7 @@ continue; } - switch(purple_prefs_get_type(name)) { + switch(purple_prefs_get_pref_type(name)) { case PURPLE_PREF_BOOLEAN: pidgin_prefs_checkbox(label, name, parent); break;
--- a/pidgin/gtkprefs.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/gtkprefs.c Thu Feb 06 19:50:34 2014 +0530 @@ -2663,7 +2663,7 @@ gtk_widget_set_sensitive(keyring_apply, TRUE); - field_type = purple_request_field_get_type(setting); + field_type = purple_request_field_get_field_type(setting); if (field_type == PURPLE_REQUEST_FIELD_BOOLEAN) { purple_request_field_bool_set_value(setting, @@ -2690,7 +2690,7 @@ label = purple_request_field_get_label(setting); - field_type = purple_request_field_get_type(setting); + field_type = purple_request_field_get_field_type(setting); if (field_type == PURPLE_REQUEST_FIELD_BOOLEAN) { widget = gtk_check_button_new_with_label(label); label = NULL; @@ -4296,7 +4296,7 @@ * that at the moment. -- rekkanoryo */ if (purple_prefs_exists(PIDGIN_PREFS_ROOT "/browsers/command") && - purple_prefs_get_type(PIDGIN_PREFS_ROOT "/browsers/command") == + purple_prefs_get_pref_type(PIDGIN_PREFS_ROOT "/browsers/command") == PURPLE_PREF_PATH) { const char *str = purple_prefs_get_path(
--- a/pidgin/gtkrequest.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/gtkrequest.c Thu Feb 06 19:50:34 2014 +0530 @@ -1039,7 +1039,7 @@ static void req_entry_field_changed_cb(GtkWidget *entry, PurpleRequestField *field) { - if (purple_request_field_get_type(field) == PURPLE_REQUEST_FIELD_INTEGER) { + if (purple_request_field_get_field_type(field) == PURPLE_REQUEST_FIELD_INTEGER) { int value = gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(entry)); purple_request_field_int_set_value(field, value); return; @@ -1108,7 +1108,7 @@ g_signal_connect(G_OBJECT(entry), "changed", G_CALLBACK(req_field_changed_cb), field); - if ((type_hint = purple_request_field_get_type_hint(field)) != NULL) + if ((type_hint = purple_request_field_get_field_type_hint(field)) != NULL) { if (purple_str_has_prefix(type_hint, "screenname")) { @@ -1123,10 +1123,10 @@ PurpleRequestField *fld = fields->data; fields = fields->next; - if (purple_request_field_get_type(fld) == PURPLE_REQUEST_FIELD_ACCOUNT && + if (purple_request_field_get_field_type(fld) == PURPLE_REQUEST_FIELD_ACCOUNT && purple_request_field_is_visible(fld)) { - const char *type_hint = purple_request_field_get_type_hint(fld); + const char *type_hint = purple_request_field_get_field_type_hint(fld); if (type_hint != NULL && strcmp(type_hint, "account") == 0) { optmenu = GTK_WIDGET(purple_request_field_get_ui_data(fld)); @@ -2212,7 +2212,7 @@ field = (PurpleRequestField *)fl->data; - type = purple_request_field_get_type(field); + type = purple_request_field_get_field_type(field); if (type == PURPLE_REQUEST_FIELD_DATASHEET) contains_resizable = TRUE; @@ -2273,7 +2273,7 @@ continue; } - type = purple_request_field_get_type(field); + type = purple_request_field_get_field_type(field); field_label = pidgin_request_escape(cpar, purple_request_field_get_label(field));
--- a/pidgin/gtksavedstatuses.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/gtksavedstatuses.c Thu Feb 06 19:50:34 2014 +0530 @@ -374,9 +374,9 @@ return; title = purple_savedstatus_get_title(saved_status); - type = purple_primitive_get_name_from_type(purple_savedstatus_get_type(saved_status)); + type = purple_primitive_get_name_from_type(purple_savedstatus_get_primitive_type(saved_status)); message = purple_markup_strip_html(purple_savedstatus_get_message(saved_status)); - icon = get_stock_icon_from_primitive(purple_savedstatus_get_type(saved_status)); + icon = get_stock_icon_from_primitive(purple_savedstatus_get_primitive_type(saved_status)); gtk_list_store_append(model, &iter); gtk_list_store_set(model, &iter, @@ -758,7 +758,7 @@ /* Modify the old status */ if (strcmp(title, dialog->original_title)) purple_savedstatus_set_title(saved_status, title); - purple_savedstatus_set_type(saved_status, type); + purple_savedstatus_set_primitive_type(saved_status, type); } if (*unformatted == '\0') @@ -1007,7 +1007,7 @@ { const PurpleStatusType *type; - type = purple_savedstatus_substatus_get_type(substatus); + type = purple_savedstatus_substatus_get_status_type(substatus); id = purple_status_type_get_id(type); name = purple_status_type_get_name(type); prim = purple_status_type_get_primitive(type); @@ -1134,7 +1134,7 @@ /* Status type */ if (saved_status != NULL) - dropdown = create_status_type_menu(purple_savedstatus_get_type(saved_status)); + dropdown = create_status_type_menu(purple_savedstatus_get_primitive_type(saved_status)); else dropdown = create_status_type_menu(PURPLE_STATUS_AWAY); dialog->type = GTK_COMBO_BOX(dropdown); @@ -1484,7 +1484,8 @@ if ((saved_status = purple_savedstatus_find(status_editor->original_title)) != NULL) { if ((substatus = purple_savedstatus_get_substatus(saved_status, account)) != NULL) { message = (char *)purple_savedstatus_substatus_get_message(substatus); - status_id = (char *)purple_status_type_get_id(purple_savedstatus_substatus_get_type(substatus)); + status_id = (char *)purple_status_type_get_id( + purple_savedstatus_substatus_get_status_type(substatus)); } } } @@ -1637,7 +1638,7 @@ if (purple_savedstatus_is_transient(current_status) && !purple_savedstatus_has_substatuses(current_status) - && purple_savedstatus_get_type(current_status) == primitive) + && purple_savedstatus_get_primitive_type(current_status) == primitive) currently_selected = TRUE; return currently_selected; @@ -1652,7 +1653,7 @@ if (store == NULL) store = GTK_LIST_STORE(gtk_combo_box_get_model(GTK_COMBO_BOX(combobox))); - primitive = purple_savedstatus_get_type(status); + primitive = purple_savedstatus_get_primitive_type(status); gtk_list_store_set(store, iter, SS_MENU_TYPE_COLUMN, SS_MENU_ENTRY_TYPE_SAVEDSTATUS, SS_MENU_ICON_COLUMN, pidgin_stock_id_from_status_primitive(primitive),
--- a/pidgin/gtkstatusbox.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/gtkstatusbox.c Thu Feb 06 19:50:34 2014 +0530 @@ -658,7 +658,7 @@ else if (account_status) primary = g_strdup(purple_status_get_name(purple_account_get_active_status(acct))); else if (purple_savedstatus_is_transient(saved_status)) - primary = g_strdup(purple_primitive_get_name_from_type(purple_savedstatus_get_type(saved_status))); + primary = g_strdup(purple_primitive_get_name_from_type(purple_savedstatus_get_primitive_type(saved_status))); else primary = g_markup_escape_text(purple_savedstatus_get_title(saved_status), -1); @@ -700,7 +700,7 @@ status_type = purple_status_get_status_type(purple_account_get_active_status(acct)); prim = purple_status_type_get_primitive(status_type); } else { - prim = purple_savedstatus_get_type(saved_status); + prim = purple_savedstatus_get_primitive_type(saved_status); } stock = pidgin_stock_id_from_status_primitive(prim); @@ -797,7 +797,7 @@ * If there is a token-account, then select the primitive from the * dropdown using a loop. Otherwise select from the default list. */ - primitive = purple_savedstatus_get_type(saved_status); + primitive = purple_savedstatus_get_primitive_type(saved_status); if (!status_box->token_status_account && purple_savedstatus_is_transient(saved_status) && ((primitive == PURPLE_STATUS_AVAILABLE) || (primitive == PURPLE_STATUS_AWAY) || (primitive == PURPLE_STATUS_INVISIBLE) || (primitive == PURPLE_STATUS_OFFLINE) || @@ -2177,7 +2177,7 @@ type == PIDGIN_STATUS_BOX_TYPE_POPULAR) { PurpleSavedStatus *saved = purple_savedstatus_find_by_creation_time(GPOINTER_TO_INT(data)); if (saved) { - prim = purple_savedstatus_get_type(saved); + prim = purple_savedstatus_get_primitive_type(saved); } } @@ -2425,14 +2425,14 @@ /* Make sure that statusbox displays the correct thing. * It can get messed up if the previous selection was a * saved status that wasn't supported by this account */ - if ((purple_savedstatus_get_type(ss) == primitive) + if ((purple_savedstatus_get_primitive_type(ss) == primitive) && purple_savedstatus_is_transient(ss) && purple_savedstatus_has_substatuses(ss)) changed = FALSE; } } else { saved_status = purple_savedstatus_get_current(); - if (purple_savedstatus_get_type(saved_status) == primitive && + if (purple_savedstatus_get_primitive_type(saved_status) == primitive && !purple_savedstatus_has_substatuses(saved_status) && purple_strequal(purple_savedstatus_get_message(saved_status), message)) { @@ -2452,7 +2452,7 @@ const char *ss_msg = purple_savedstatus_get_message(ss); /* find a known transient status that is the same as the * new selected one */ - if ((purple_savedstatus_get_type(ss) == primitive) && purple_savedstatus_is_transient(ss) && + if ((purple_savedstatus_get_primitive_type(ss) == primitive) && purple_savedstatus_is_transient(ss) && purple_savedstatus_has_substatuses(ss) && /* Must have substatuses */ purple_strequal(ss_msg, message)) { @@ -2462,7 +2462,8 @@ PurpleAccount *acct = tmp->data; PurpleSavedStatusSub *sub = purple_savedstatus_get_substatus(ss, acct); if (sub) { - const PurpleStatusType *sub_type = purple_savedstatus_substatus_get_type(sub); + const PurpleStatusType *sub_type = + purple_savedstatus_substatus_get_status_type(sub); const char *subtype_status_id = purple_status_type_get_id(sub_type); if (purple_strequal(subtype_status_id, id)) { found = TRUE; @@ -2684,7 +2685,7 @@ { PurpleSavedStatus *saved_status; saved_status = purple_savedstatus_get_current(); - if (purple_savedstatus_get_type(saved_status) == PURPLE_STATUS_AVAILABLE) + if (purple_savedstatus_get_primitive_type(saved_status) == PURPLE_STATUS_AVAILABLE) saved_status = purple_savedstatus_new(NULL, PURPLE_STATUS_AWAY); pidgin_status_editor_show(FALSE, purple_savedstatus_is_transient(saved_status) @@ -2760,7 +2761,7 @@ { gint index = -1; - switch (purple_savedstatus_get_type(saved_status)) + switch (purple_savedstatus_get_primitive_type(saved_status)) { /* In reverse order */ case PURPLE_STATUS_OFFLINE:
--- a/pidgin/plugins/contact_priority.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/plugins/contact_priority.c Thu Feb 06 19:50:34 2014 +0530 @@ -46,9 +46,9 @@ static void pref_update(GtkWidget *widget, char *pref) { - if (purple_prefs_get_type(pref) == PURPLE_PREF_INT) + if (purple_prefs_get_pref_type(pref) == PURPLE_PREF_INT) purple_prefs_set_int(pref, gtk_spin_button_get_value_as_int(GTK_SPIN_BUTTON(widget))); - if (purple_prefs_get_type(pref) == PURPLE_PREF_BOOLEAN) + if (purple_prefs_get_pref_type(pref) == PURPLE_PREF_BOOLEAN) purple_prefs_set_bool(pref, gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))); }
--- a/pidgin/plugins/extplacement.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/plugins/extplacement.c Thu Feb 06 19:50:34 2014 +0530 @@ -104,7 +104,7 @@ /* Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above */ ppref = purple_plugin_pref_new_with_label(_("Note: The preference for \"New conversations\" must be set to \"By conversation count\".")); - purple_plugin_pref_set_type(ppref, PURPLE_PLUGIN_PREF_INFO); + purple_plugin_pref_set_pref_type(ppref, PURPLE_PLUGIN_PREF_INFO); purple_plugin_pref_frame_add(frame, ppref); ppref = purple_plugin_pref_new_with_name_and_label(
--- a/pidgin/plugins/unity.c Thu Feb 06 18:40:31 2014 +0530 +++ b/pidgin/plugins/unity.c Thu Feb 06 19:50:34 2014 +0530 @@ -280,7 +280,7 @@ { MessagingMenuStatus status = MESSAGING_MENU_STATUS_AVAILABLE; - switch (purple_savedstatus_get_type(saved_status)) { + switch (purple_savedstatus_get_primitive_type(saved_status)) { case PURPLE_STATUS_AVAILABLE: case PURPLE_STATUS_MOOD: case PURPLE_STATUS_TUNE:
