Mercurial > pidgin.yaz
changeset 22790:862382aa6086
Do not add a ':' if there's already one at the end. Thanks to wjt for
noticing.
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Fri, 02 May 2008 16:55:59 +0000 |
| parents | 158dedbfd5f1 |
| children | 9cbb7c2aba23 |
| files | pidgin/gtkrequest.c |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkrequest.c Fri May 02 16:07:12 2008 +0000 +++ b/pidgin/gtkrequest.c Fri May 02 16:55:59 2008 +0000 @@ -1282,6 +1282,7 @@ size_t col_offset = col_num * 2; PurpleRequestFieldType type; GtkWidget *widget = NULL; + const char *field_label; label = NULL; field = fl->data; @@ -1292,17 +1293,17 @@ } type = purple_request_field_get_type(field); + field_label = purple_request_field_get_label(field); - if (type != PURPLE_REQUEST_FIELD_BOOLEAN && - purple_request_field_get_label(field)) + if (type != PURPLE_REQUEST_FIELD_BOOLEAN && field_label) { - char *text; + char *text = NULL; - text = g_strdup_printf("%s:", - purple_request_field_get_label(field)); + if (field_label[strlen(field_label) - 1] != ':') + text = g_strdup_printf("%s:", field_label); label = gtk_label_new(NULL); - gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), text); + gtk_label_set_markup_with_mnemonic(GTK_LABEL(label), text ? text : field_label); g_free(text); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);