From 84534e01d3a89581c490b5d0f5c0fd0c541a4bf3 Mon Sep 17 00:00:00 2001 From: Tristan Chabredier Date: Tue, 4 Dec 2007 21:34:20 +0000 Subject: [PATCH] 2007-12-04 [wwp] 3.1.0cvs54 * src/prefs_other.c Fix for bug #1419. --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/prefs_other.c | 9 +++++---- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e2cac700..b5758209a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-12-04 [wwp] 3.1.0cvs54 + + * src/prefs_other.c + Fix for bug #1419. + 2007-12-04 [holger] 3.1.0cvs53 * src/addrduplicates.c diff --git a/PATCHSETS b/PATCHSETS index 989cf19ed..2ce978b27 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -3111,3 +3111,4 @@ ( cvs diff -u -r 1.213.2.170 -r 1.213.2.171 src/folder.c; cvs diff -u -r 1.87.2.51 -r 1.87.2.52 src/folder.h; cvs diff -u -r 1.207.2.189 -r 1.207.2.190 src/folderview.c; cvs diff -u -r 1.179.2.202 -r 1.179.2.203 src/imap.c; cvs diff -u -r 1.274.2.222 -r 1.274.2.223 src/mainwindow.c; cvs diff -u -r 1.43.2.65 -r 1.43.2.66 src/prefs_matcher.c; ) > 3.1.0cvs51.patchset ( cvs diff -u -r 1.101.2.46 -r 1.101.2.47 src/news.c; cvs diff -u -r 1.150.2.106 -r 1.150.2.107 src/procmsg.c; cvs diff -u -r 1.25.2.24 -r 1.25.2.25 tools/Makefile.am; cvs diff -u -r -1.1.14.4 -r -1.1.14.5 tools/README.sylprint; cvs diff -u -r -1.2.14.3 -r -1.2.14.4 tools/sylprint.pl; cvs diff -u -r -1.1.14.2 -r -1.1.14.3 tools/sylprint.rc; ) > 3.1.0cvs52.patchset ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/addrduplicates.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/addrduplicates.h; ) > 3.1.0cvs53.patchset +( cvs diff -u -r 1.1.2.25 -r 1.1.2.26 src/prefs_other.c; ) > 3.1.0cvs54.patchset diff --git a/configure.ac b/configure.ac index f134fcf47..aa34dbabd 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=1 MICRO_VERSION=0 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=53 +EXTRA_VERSION=54 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/prefs_other.c b/src/prefs_other.c index f78d0f8f1..0b2036a05 100644 --- a/src/prefs_other.c +++ b/src/prefs_other.c @@ -197,7 +197,6 @@ static void prefs_keybind_apply(struct KeyBind keybind[], gint num) static void prefs_keybind_apply_clicked(GtkWidget *widget) { - GtkEntry *entry = GTK_ENTRY(GTK_BIN(keybind.combo)->child); const gchar *text; struct KeyBind *menurc; gint n_menurc; @@ -446,9 +445,9 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget) {"/Edit/Advanced/Delete a word backward", "W"}, {"/Edit/Advanced/Delete a word forward", "D"}, }; - - text = gtk_entry_get_text(entry); - + + text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(keybind.combo)); + if (!strcmp(text, _("Default"))) { menurc = default_menurc; n_menurc = G_N_ELEMENTS(default_menurc); @@ -462,8 +461,10 @@ static void prefs_keybind_apply_clicked(GtkWidget *widget) menurc = old_sylpheed_menurc; n_menurc = G_N_ELEMENTS(old_sylpheed_menurc); } else { + g_free(text); return; } + g_free(text); /* prefs_keybind_apply(empty_menurc, G_N_ELEMENTS(empty_menurc)); */ prefs_keybind_apply(menurc, n_menurc); -- 2.25.1