2007-04-14 [colin] 2.8.1cvs99

	* src/message_search.c
	* src/prefs_display_header.c
	* src/summary_search.c
	* src/gtk/combobox.c
		Fix allocations

diff --git a/ChangeLog b/ChangeLog
index 36d2f0410135498c125745ea9f034594b131ba00..be7027a34d6d7cef277f4162f179d3207b255029 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-04-14 [colin]     2.8.1cvs99
+
+       * src/message_search.c
+       * src/prefs_display_header.c
+       * src/summary_search.c
+       * src/gtk/combobox.c
+               Fix allocations
+
 2007-04-14 [wwp]       2.8.1cvs98
 
        * src/gtk/combobox.c

diff --git a/PATCHSETS b/PATCHSETS
index cea00308b9fe62b5b18ae7339395eb25d9443a54..32f3e34e25baaf2a1562595989c451f6bf59ec06 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -2515,3 +2515,4 @@
 ( cvs diff -u -r 1.3.12.24 -r 1.3.12.25 src/message_search.c;  cvs diff -u -r 1.16.2.24 -r 1.16.2.25 src/prefs_display_header.c;  cvs diff -u -r 1.15.2.45 -r 1.15.2.46 src/summary_search.c;  ) > 2.8.1cvs96.patchset
 ( cvs diff -u -r 1.1.2.65 -r 1.1.2.66 src/gtk/quicksearch.c;  ) > 2.8.1cvs97.patchset
 ( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/gtk/combobox.c;  cvs diff -u -r 1.3.12.25 -r 1.3.12.26 src/message_search.c;  cvs diff -u -r 1.15.2.46 -r 1.15.2.47 src/summary_search.c;  cvs diff -u -r 1.16.2.25 -r 1.16.2.26 src/prefs_display_header.c;  ) > 2.8.1cvs98.patchset
+( cvs diff -u -r 1.3.12.26 -r 1.3.12.27 src/message_search.c;  cvs diff -u -r 1.16.2.26 -r 1.16.2.27 src/prefs_display_header.c;  cvs diff -u -r 1.15.2.47 -r 1.15.2.48 src/summary_search.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/combobox.c;  ) > 2.8.1cvs99.patchset

diff --git a/configure.ac b/configure.ac
index 649ebfb34030cf302d849f19a479b13d673ad67a..80a29f5016e0af043f2fe130641362b9ee78eb9b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=98
+EXTRA_VERSION=99
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/gtk/combobox.c b/src/gtk/combobox.c
index 4620ff95d6ab773cbda49602032641365dbfdfd2..49a65ca3102b0c35ecbe8eb6eedb3c8a06304a9f 100644 (file)
--- a/src/gtk/combobox.c
+++ b/src/gtk/combobox.c
@@ -136,10 +136,11 @@ gboolean combobox_set_value_from_arrow_key(GtkComboBox *combobox,
                /* if current text is in list, get prev or next one */
 
                if (keyval == GDK_Up) {
-                       const gchar *text = gtk_combo_box_get_active_text(combobox);
+                       gchar *text = gtk_combo_box_get_active_text(combobox);
                        if (!text)
-                               text = gtk_entry_get_text(gtk_bin_get_child(GTK_BIN(combobox)));
+                               text = gtk_editable_get_chars(GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(combobox))),0,-1);
                        valid = gtkut_tree_model_text_iter_prev(model, &iter, text);
+                       g_free(text);
                } else
                if (keyval == GDK_Down)
                        valid = gtk_tree_model_iter_next(model, &iter);

diff --git a/src/message_search.c b/src/message_search.c
index 26b8ebf0dfdb3599fec819f3e514a7576dd6f210..26638267a4072e07db0e391a641e6b2c44c46672 100644 (file)
--- a/src/message_search.c
+++ b/src/message_search.c
@@ -279,7 +279,8 @@ static void message_search_execute(gboolean backward)
 
        body_str = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
        if (!body_str)
-               body_str = gtk_entry_get_text(gtk_bin_get_child(GTK_BIN(search_window.body_entry)));
+               body_str = gtk_editable_get_chars(
+                               GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.body_entry))),0,-1);
        if (!body_str || *body_str == '\0') return;
 
        /* add to history */
@@ -356,6 +357,7 @@ static void message_search_execute(gboolean backward)
 
        search_window.is_searching = FALSE;
        message_hide_stop_button();
+       g_free(body_str);
 }
 
 static void body_changed(void)

diff --git a/src/prefs_display_header.c b/src/prefs_display_header.c
index ba7e7882dad13f6bb91105a2c6644af08ff57842..5bf1b0032b1003882598c3817bbff4f27b4104c8 100644 (file)
--- a/src/prefs_display_header.c
+++ b/src/prefs_display_header.c
@@ -562,7 +562,8 @@ static void prefs_display_header_list_view_set_row(gboolean hidden)
 
        entry_text = gtk_combo_box_get_active_text(GTK_COMBO_BOX(dispheader.hdr_combo));
        if (!entry_text)
-               entry_text = gtk_entry_get_text(gtk_bin_get_child(GTK_BIN(dispheader.hdr_combo)));
+               entry_text = gtk_editable_get_chars(
+                               GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(dispheader.hdr_combo))),0,-1);
        if (!entry_text || entry_text[0] == '\0') {
                alertpanel_error(_("Header name is not set."));
                return;
@@ -588,6 +589,8 @@ static void prefs_display_header_list_view_set_row(gboolean hidden)
                                           dp->name, dp);
 
        prefs_display_header_set_list();
+       
+       g_free(entry_text);
 }
 
 static void prefs_display_header_register_cb(GtkButton *btn,

diff --git a/src/summary_search.c b/src/summary_search.c
index 608db48fa8c488bc7f2a1e5c0205b2e3172c645c..4abed83e69ca0e5ddee156696d05a0188b9b7b20 100644 (file)
--- a/src/summary_search.c
+++ b/src/summary_search.c
@@ -525,7 +525,8 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                }
                adv_condition = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.adv_condition_entry));
                if (!adv_condition)
-                       adv_condition = gtk_entry_get_text(gtk_bin_get_child(GTK_BIN(search_window.adv_condition_entry)));
+                       adv_condition = gtk_editable_get_chars(
+                                       GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.adv_condition_entry))),0,-1);
                if (adv_condition && adv_condition[0] != '\0') {
 
                        /* add to history */
@@ -539,6 +540,7 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                        if (!is_fast)
                                interval = 100;
                        /* TODO: check for condition parsing error and show an error dialog */
+                       g_free(adv_condition);
                } else {
                        /* TODO: warn if no search condition? (or make buttons enabled only when
                                at least one search condition has been set */
@@ -564,13 +566,17 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                body_str    = gtk_combo_box_get_active_text(GTK_COMBO_BOX(search_window.body_entry));
 
                if (!from_str)
-                       from_str = gtk_entry_get_text(gtk_bin_get_child(GTK_BIN(search_window.from_entry)));
+                       from_str = gtk_editable_get_chars(
+                                       GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.from_entry))),0,-1);
                if (!to_str)
-                       to_str = gtk_entry_get_text(gtk_bin_get_child(GTK_BIN(search_window.to_entry)));
+                       to_str = gtk_editable_get_chars(
+                                       GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.to_entry))),0,-1);
                if (!subject_str)
-                       subject_str = gtk_entry_get_text(gtk_bin_get_child(GTK_BIN(search_window.subject_entry)));
+                       subject_str = gtk_editable_get_chars(
+                                       GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.subject_entry))),0,-1);
                if (!body_str)
-                       body_str = gtk_entry_get_text(gtk_bin_get_child(GTK_BIN(search_window.body_entry)));
+                       body_str = gtk_editable_get_chars(
+                                       GTK_EDITABLE(gtk_bin_get_child(GTK_BIN(search_window.body_entry))),0,-1);
 
                if (!from_str || !to_str || !subject_str || !body_str) {
                        /* TODO: warn if no search criteria? (or make buttons enabled only when
@@ -783,6 +789,11 @@ static void summary_search_execute(gboolean backward, gboolean search_all)
                        GTK_EVENTS_FLUSH();
        }
 
+       g_free(from_str);
+       g_free(to_str);
+       g_free(subject_str);
+       g_free(body_str);
+
        search_window.is_searching = FALSE;
        summary_hide_stop_button();
        main_window_cursor_normal(summaryview->mainwin);