diff options
| author | Ankit Vani <a@nevitus.org> | 2014-05-10 03:56:36 +0530 |
|---|---|---|
| committer | Ankit Vani <a@nevitus.org> | 2014-05-10 03:56:36 +0530 |
| commit | 42aa73ae8772ed98ab1823f831f6bb64bac15e93 (patch) | |
| tree | 57604c909ca472de14a771cca80861b65deddff5 /finch/gntaccount.c | |
| parent | 9c29832d5d384b9b9c3857fdd48ef3b1bd14f159 (diff) | |
| parent | ff7d11cbf2702fc6ff089ff5f768517bcd7595e5 (diff) | |
| download | pidgin-42aa73ae8772ed98ab1823f831f6bb64bac15e93.tar.gz | |
Merged default branch
Diffstat (limited to 'finch/gntaccount.c')
| -rw-r--r-- | finch/gntaccount.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/finch/gntaccount.c b/finch/gntaccount.c index 5c7c420aba..95815e8d1a 100644 --- a/finch/gntaccount.c +++ b/finch/gntaccount.c @@ -137,7 +137,7 @@ save_account_cb(AccountEditDialog *dialog) PurpleAccountUserSplit *split = iter->data; GntWidget *entry = entries->data; - value = gnt_entry_get_text(GNT_ENTRY(entry)); + value = entry ? gnt_entry_get_text(GNT_ENTRY(entry)) : NULL; if (value == NULL || *value == '\0') value = purple_account_user_split_get_default_value(split); g_string_append_printf(username, "%c%s", @@ -317,17 +317,19 @@ update_user_splits(AccountEditDialog *dialog) for (iter = purple_protocol_get_user_splits(protocol); iter; iter = iter->next) { PurpleAccountUserSplit *split = iter->data; - GntWidget *entry; - char *buf; + GntWidget *entry = NULL; + char *buf = NULL; - hbox = gnt_hbox_new(TRUE); - gnt_box_add_widget(GNT_BOX(dialog->splits), hbox); + if (!purple_account_user_split_is_constant(split)) { + hbox = gnt_hbox_new(TRUE); + gnt_box_add_widget(GNT_BOX(dialog->splits), hbox); - buf = g_strdup_printf("%s:", purple_account_user_split_get_text(split)); - gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(buf)); + buf = g_strdup_printf("%s:", purple_account_user_split_get_text(split)); + gnt_box_add_widget(GNT_BOX(hbox), gnt_label_new(buf)); - entry = gnt_entry_new(NULL); - gnt_box_add_widget(GNT_BOX(hbox), entry); + entry = gnt_entry_new(NULL); + gnt_box_add_widget(GNT_BOX(hbox), entry); + } dialog->split_entries = g_list_append(dialog->split_entries, entry); g_free(buf); @@ -358,7 +360,7 @@ update_user_splits(AccountEditDialog *dialog) if (value == NULL) value = purple_account_user_split_get_default_value(split); - if (value != NULL) + if (value != NULL && entry != NULL) gnt_entry_set_text(GNT_ENTRY(entry), value); } |