2006-07-01 [ticho] 2.3.1cvs49
authorAndrej Kacian <ticho@claws-mail.org>
Sat, 1 Jul 2006 15:22:44 +0000 (15:22 +0000)
committerAndrej Kacian <ticho@claws-mail.org>
Sat, 1 Jul 2006 15:22:44 +0000 (15:22 +0000)
* src/prefs_account.c
Only use one temporary gchar* variable in
prefs_account_protocol_set_optmenu().

ChangeLog
PATCHSETS
configure.ac
src/prefs_account.c

index 53a7a11..bf8c98e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-01 [ticho]     2.3.1cvs49
+
+       * src/prefs_account.c
+               Only use one temporary gchar* variable in
+               prefs_account_protocol_set_optmenu().
+
 2006-07-01 [ticho]     2.3.1cvs48
 
        * src/prefs_account.c
index 0895ee3..2925cab 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.17.2.31 -r 1.17.2.32 src/send_message.c;  ) > 2.3.1cvs46.patchset
 ( cvs diff -u -r 1.382.2.290 -r 1.382.2.291 src/compose.c;  ) > 2.3.1cvs47.patchset
 ( cvs diff -u -r 1.105.2.59 -r 1.105.2.60 src/prefs_account.c;  cvs diff -u -r 1.49.2.20 -r 1.49.2.21 src/prefs_account.h;  ) > 2.3.1cvs48.patchset
+( cvs diff -u -r 1.105.2.60 -r 1.105.2.61 src/prefs_account.c;  ) > 2.3.1cvs49.patchset
index 7212975..76b67f9 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=3
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=48
+EXTRA_VERSION=49
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index d6075fe..9389ad3 100644 (file)
@@ -2671,7 +2671,7 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
        GtkWidget *optmenu = protocol_optmenu->combobox;
        GtkWidget *optlabel = protocol_optmenu->label;
        GtkWidget *descrlabel = protocol_optmenu->descrlabel;
-       gchar *label = NULL, *tmp = NULL;
+       gchar *label = NULL;
 
        protocol = *((RecvProtocol *)pparam->data);
 
@@ -2686,9 +2686,9 @@ static void prefs_account_protocol_set_optmenu(PrefParam *pparam)
                gtk_widget_show(optmenu);
        } else {
                /* We don't want translators to hate us, so... */
-               tmp = g_strdup_printf("%s:", _("Protocol"));
-               gtk_label_set_text(GTK_LABEL(descrlabel), tmp);
-               g_free(tmp);
+               label = g_strdup_printf("%s:", _("Protocol"));
+               gtk_label_set_text(GTK_LABEL(descrlabel), label);
+               g_free(label);
                label = g_markup_printf_escaped("<b>%s</b>", protocol_names[protocol]);
                gtk_label_set_markup(GTK_LABEL(optlabel), label);
                g_free(label);