comparison finch/gntrequest.c @ 25378:47540809ae91

explicit merge of '82e4edbe06cb0ef0fa59f70db44a289bb91e1343' and '8edc2ac791e936a5d9eddd85e451d25e1afa5ba6'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:23:19 +0000
parents 54a1c63873b2
children 6e1967b0f90b
comparison
equal deleted inserted replaced
24769:29931785a68a 25378:47540809ae91
37 #include "finch.h" 37 #include "finch.h"
38 #include "gntrequest.h" 38 #include "gntrequest.h"
39 #include "debug.h" 39 #include "debug.h"
40 #include "util.h" 40 #include "util.h"
41 41
42 /* XXX: Until gobjectification ... */
43 #undef FINCH_GET_DATA
44 #undef FINCH_SET_DATA
45 #define FINCH_GET_DATA(obj) purple_request_field_get_ui_data(obj)
46 #define FINCH_SET_DATA(obj, data) purple_request_field_set_ui_data(obj, data)
47
42 typedef struct 48 typedef struct
43 { 49 {
44 void *user_data; 50 void *user_data;
45 GntWidget *dialog; 51 GntWidget *dialog;
46 GCallback *cbs; 52 GCallback *cbs;
631 { 637 {
632 FINCH_SET_DATA(field, create_list_field(field)); 638 FINCH_SET_DATA(field, create_list_field(field));
633 } 639 }
634 else if (type == PURPLE_REQUEST_FIELD_ACCOUNT) 640 else if (type == PURPLE_REQUEST_FIELD_ACCOUNT)
635 { 641 {
636 accountlist = FINCH_SET_DATA(field, create_account_field(field)); 642 accountlist = create_account_field(field);
643 FINCH_SET_DATA(field, accountlist);
637 } 644 }
638 else 645 else
639 { 646 {
640 FINCH_SET_DATA(field, gnt_label_new_with_format(_("Not implemented yet."), 647 FINCH_SET_DATA(field, gnt_label_new_with_format(_("Not implemented yet."),
641 GNT_TEXT_FLAG_BOLD)); 648 GNT_TEXT_FLAG_BOLD));