Mercurial > pidgin
comparison finch/gntrequest.c @ 27670:31905a0d1c9d
merge of '6f4d0e183ebb11a95980e184e63bd4709aa24306'
and '9fa808b57669d76c0989b16c2568cb7a7047511e'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Wed, 22 Jul 2009 06:12:13 +0000 |
| parents | f7c5bb2f6623 |
| children | 88d889b54df4 |
comparison
equal
deleted
inserted
replaced
| 27436:b171a80dff25 | 27670:31905a0d1c9d |
|---|---|
| 33 #include <gntlabel.h> | 33 #include <gntlabel.h> |
| 34 #include <gntline.h> | 34 #include <gntline.h> |
| 35 #include <gnttree.h> | 35 #include <gnttree.h> |
| 36 | 36 |
| 37 #include "finch.h" | 37 #include "finch.h" |
| 38 #include <internal.h> | |
| 38 #include "gntrequest.h" | 39 #include "gntrequest.h" |
| 39 #include "debug.h" | 40 #include "debug.h" |
| 40 #include "util.h" | 41 #include "util.h" |
| 41 | 42 |
| 42 /* XXX: Until gobjectification ... */ | 43 /* XXX: Until gobjectification ... */ |
| 315 | 316 |
| 316 for (; fields ; fields = fields->next) | 317 for (; fields ; fields = fields->next) |
| 317 { | 318 { |
| 318 PurpleRequestField *field = fields->data; | 319 PurpleRequestField *field = fields->data; |
| 319 PurpleRequestFieldType type = purple_request_field_get_type(field); | 320 PurpleRequestFieldType type = purple_request_field_get_type(field); |
| 321 if (!purple_request_field_is_visible(field)) | |
| 322 continue; | |
| 320 if (type == PURPLE_REQUEST_FIELD_BOOLEAN) | 323 if (type == PURPLE_REQUEST_FIELD_BOOLEAN) |
| 321 { | 324 { |
| 322 GntWidget *check = FINCH_GET_DATA(field); | 325 GntWidget *check = FINCH_GET_DATA(field); |
| 323 gboolean value = gnt_check_box_get_checked(GNT_CHECK_BOX(check)); | 326 gboolean value = gnt_check_box_get_checked(GNT_CHECK_BOX(check)); |
| 324 purple_request_field_bool_set_value(field, value); | 327 purple_request_field_bool_set_value(field, value); |
| 596 gnt_box_add_widget(GNT_BOX(box), | 599 gnt_box_add_widget(GNT_BOX(box), |
| 597 gnt_label_new_with_format(title, GNT_TEXT_FLAG_BOLD)); | 600 gnt_label_new_with_format(title, GNT_TEXT_FLAG_BOLD)); |
| 598 | 601 |
| 599 for (; fields ; fields = fields->next) | 602 for (; fields ; fields = fields->next) |
| 600 { | 603 { |
| 601 /* XXX: Break each of the fields into a separate function? */ | |
| 602 PurpleRequestField *field = fields->data; | 604 PurpleRequestField *field = fields->data; |
| 603 PurpleRequestFieldType type = purple_request_field_get_type(field); | 605 PurpleRequestFieldType type = purple_request_field_get_type(field); |
| 604 const char *label = purple_request_field_get_label(field); | 606 const char *label = purple_request_field_get_label(field); |
| 607 | |
| 608 if (!purple_request_field_is_visible(field)) | |
| 609 continue; | |
| 605 | 610 |
| 606 hbox = gnt_hbox_new(TRUE); /* hrm */ | 611 hbox = gnt_hbox_new(TRUE); /* hrm */ |
| 607 gnt_box_add_widget(GNT_BOX(box), hbox); | 612 gnt_box_add_widget(GNT_BOX(box), hbox); |
| 608 | 613 |
| 609 if (type != PURPLE_REQUEST_FIELD_BOOLEAN && label) | 614 if (type != PURPLE_REQUEST_FIELD_BOOLEAN && label) |