pidgin: 4bcc80fd: Rather use the accessor functions direct...
andrew.victor at mxit.com
andrew.victor at mxit.com
Fri Aug 26 17:30:54 EDT 2011
----------------------------------------------------------------------
Revision: 4bcc80fdf6dc377830573c618a473c881e2adbb9
Parent: 9b207ac5cd8de2ab0769b07698cea1206382bdcb
Author: andrew.victor at mxit.com
Date: 08/26/11 16:29:23
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/4bcc80fdf6dc377830573c618a473c881e2adbb9
Changelog:
Rather use the accessor functions directly.
Changes against parent 9b207ac5cd8de2ab0769b07698cea1206382bdcb
patched finch/gntrequest.c
patched finch/gntroomlist.c
-------------- next part --------------
============================================================
--- finch/gntrequest.c a893723e3f647da31c6da8cf8258f83a2128d423
+++ finch/gntrequest.c f91ca2c96ce82651ca1aaf6786d67d07b10c889c
@@ -41,12 +41,6 @@
#include "debug.h"
#include "util.h"
-/* XXX: Until gobjectification ... */
-#undef FINCH_GET_DATA
-#undef FINCH_SET_DATA
-#define FINCH_GET_DATA(obj) purple_request_field_get_ui_data(obj)
-#define FINCH_SET_DATA(obj, data) purple_request_field_set_ui_data(obj, data)
-
typedef struct
{
void *user_data;
@@ -323,26 +317,26 @@ request_fields_cb(GntWidget *button, Pur
continue;
if (type == PURPLE_REQUEST_FIELD_BOOLEAN)
{
- GntWidget *check = FINCH_GET_DATA(field);
+ GntWidget *check = purple_request_field_get_ui_data(field);
gboolean value = gnt_check_box_get_checked(GNT_CHECK_BOX(check));
purple_request_field_bool_set_value(field, value);
}
else if (type == PURPLE_REQUEST_FIELD_STRING)
{
- GntWidget *entry = FINCH_GET_DATA(field);
+ GntWidget *entry = purple_request_field_get_ui_data(field);
const char *text = gnt_entry_get_text(GNT_ENTRY(entry));
purple_request_field_string_set_value(field, (text && *text) ? text : NULL);
}
else if (type == PURPLE_REQUEST_FIELD_INTEGER)
{
- GntWidget *entry = FINCH_GET_DATA(field);
+ GntWidget *entry = purple_request_field_get_ui_data(field);
const char *text = gnt_entry_get_text(GNT_ENTRY(entry));
int value = (text && *text) ? atoi(text) : 0;
purple_request_field_int_set_value(field, value);
}
else if (type == PURPLE_REQUEST_FIELD_CHOICE)
{
- GntWidget *combo = FINCH_GET_DATA(field);
+ GntWidget *combo = purple_request_field_get_ui_data(field);
int id;
id = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo)));
purple_request_field_choice_set_value(field, id);
@@ -352,7 +346,7 @@ request_fields_cb(GntWidget *button, Pur
GList *list = NULL, *iter;
if (purple_request_field_list_get_multi_select(field))
{
- GntWidget *tree = FINCH_GET_DATA(field);
+ GntWidget *tree = purple_request_field_get_ui_data(field);
iter = purple_request_field_list_get_items(field);
for (; iter; iter = iter->next)
@@ -365,7 +359,7 @@ request_fields_cb(GntWidget *button, Pur
}
else
{
- GntWidget *combo = FINCH_GET_DATA(field);
+ GntWidget *combo = purple_request_field_get_ui_data(field);
gpointer data = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
iter = purple_request_field_list_get_items(field);
@@ -384,7 +378,7 @@ request_fields_cb(GntWidget *button, Pur
}
else if (type == PURPLE_REQUEST_FIELD_ACCOUNT)
{
- GntWidget *combo = FINCH_GET_DATA(field);
+ GntWidget *combo = purple_request_field_get_ui_data(field);
PurpleAccount *acc = gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo));
purple_request_field_account_set_value(field, acc);
}
@@ -633,36 +627,36 @@ finch_request_fields(const char *title,
if (type == PURPLE_REQUEST_FIELD_BOOLEAN)
{
- FINCH_SET_DATA(field, create_boolean_field(field));
+ purple_request_field_set_ui_data(field, create_boolean_field(field));
}
else if (type == PURPLE_REQUEST_FIELD_STRING)
{
- FINCH_SET_DATA(field, create_string_field(field, &username));
+ purple_request_field_set_ui_data(field, create_string_field(field, &username));
}
else if (type == PURPLE_REQUEST_FIELD_INTEGER)
{
- FINCH_SET_DATA(field, create_integer_field(field));
+ purple_request_field_set_ui_data(field, create_integer_field(field));
}
else if (type == PURPLE_REQUEST_FIELD_CHOICE)
{
- FINCH_SET_DATA(field, create_choice_field(field));
+ purple_request_field_set_ui_data(field, create_choice_field(field));
}
else if (type == PURPLE_REQUEST_FIELD_LIST)
{
- FINCH_SET_DATA(field, create_list_field(field));
+ purple_request_field_set_ui_data(field, create_list_field(field));
}
else if (type == PURPLE_REQUEST_FIELD_ACCOUNT)
{
accountlist = create_account_field(field);
- FINCH_SET_DATA(field, accountlist);
+ purple_request_field_set_ui_data(field, accountlist);
}
else
{
- FINCH_SET_DATA(field, gnt_label_new_with_format(_("Not implemented yet."),
+ purple_request_field_set_ui_data(field, gnt_label_new_with_format(_("Not implemented yet."),
GNT_TEXT_FLAG_BOLD));
}
gnt_box_set_alignment(GNT_BOX(hbox), GNT_ALIGN_MID);
- gnt_box_add_widget(GNT_BOX(hbox), GNT_WIDGET(FINCH_GET_DATA(field)));
+ gnt_box_add_widget(GNT_BOX(hbox), GNT_WIDGET(purple_request_field_get_ui_data(field)));
}
if (grlist->next)
gnt_box_add_widget(GNT_BOX(box), gnt_hline_new());
============================================================
--- finch/gntroomlist.c 13ae5cb22786e7830e878fcaecb7ce0988accc44
+++ finch/gntroomlist.c 910f5627995c2f8d7034de115d38e3ef4a714078
@@ -41,12 +41,7 @@
#define PREF_ROOT "/finch/roomlist"
-#undef FINCH_GET_DATA
-#undef FINCH_SET_DATA
-#define FINCH_GET_DATA(obj) purple_roomlist_get_ui_data(obj)
-#define FINCH_SET_DATA(obj, data) purple_roomlist_set_ui_data(obj, data)
-
/* Yes, just one roomlist at a time. Let's not get greedy. Aight? */
struct _FinchRoomlist
{
@@ -349,7 +344,7 @@ fl_create(PurpleRoomlist *list)
static void
fl_create(PurpleRoomlist *list)
{
- FINCH_SET_DATA(list, &froomlist);
+ purple_roomlist_set_ui_data(list, &froomlist);
setup_roomlist(NULL);
update_roomlist(list);
}
More information about the Commits
mailing list