summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
18d3220)
* src/gtk/quicksearch.c
Fix bug 1336, 'Segfault if empty space before search-string'
+2007-09-27 [colin] 3.0.1cvs35
+
+ * src/gtk/quicksearch.c
+ Fix bug 1336, 'Segfault if empty space before search-string'
+
2007-09-26 [mones] 3.0.1cvs34
* manual/account.xml
2007-09-26 [mones] 3.0.1cvs34
* manual/account.xml
( cvs diff -u -r 1.94.2.152 -r 1.94.2.153 src/messageview.c; cvs diff -u -r 1.150.2.102 -r 1.150.2.103 src/procmsg.c; cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/procmsg.h; ) > 3.0.1cvs32.patchset
( cvs diff -u -r 1.654.2.2952 -r 1.654.2.2953 configure.ac; ) > 3.0.1cvs33.patchset
( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/account.xml; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 manual/plugins.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/account.xml; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/es/advanced.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/claws-mail-manual.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/glossary.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/gpl.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/keyboard.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/plugins.xml; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/fr/plugins.xml; ) > 3.0.1cvs34.patchset
( cvs diff -u -r 1.94.2.152 -r 1.94.2.153 src/messageview.c; cvs diff -u -r 1.150.2.102 -r 1.150.2.103 src/procmsg.c; cvs diff -u -r 1.60.2.48 -r 1.60.2.49 src/procmsg.h; ) > 3.0.1cvs32.patchset
( cvs diff -u -r 1.654.2.2952 -r 1.654.2.2953 configure.ac; ) > 3.0.1cvs33.patchset
( cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/account.xml; cvs diff -u -r 1.1.2.19 -r 1.1.2.20 manual/plugins.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/account.xml; cvs diff -u -r 1.1.2.10 -r 1.1.2.11 manual/es/advanced.xml; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 manual/es/claws-mail-manual.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/glossary.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/gpl.xml; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 manual/es/keyboard.xml; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 manual/es/plugins.xml; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 manual/fr/plugins.xml; ) > 3.0.1cvs34.patchset
+( cvs diff -u -r 1.1.2.77 -r 1.1.2.78 src/gtk/quicksearch.c; ) > 3.0.1cvs35.patchset
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt), index);
}
gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt), index);
}
+static gchar *quicksearch_get_text(QuickSearch * quicksearch)
+{
+ gchar *search_string = gtk_editable_get_chars(GTK_EDITABLE(GTK_BIN(quicksearch->search_string_entry)->child), 0, -1);
+
+ g_strstrip(search_string);
+ return search_string;
+}
+
static void prepare_matcher(QuickSearch *quicksearch)
{
static void prepare_matcher(QuickSearch *quicksearch)
{
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ gchar *search_string = quicksearch_get_text(quicksearch);
if (search_string == NULL || search_string[0] == '\0') {
quicksearch_set_active(quicksearch, FALSE);
if (search_string == NULL || search_string[0] == '\0') {
quicksearch_set_active(quicksearch, FALSE);
if (quicksearch->matcher_list != NULL) {
if (quicksearch->matching) {
quicksearch->deferred_free = TRUE;
if (quicksearch->matcher_list != NULL) {
if (quicksearch->matching) {
quicksearch->deferred_free = TRUE;
return;
}
quicksearch->deferred_free = FALSE;
return;
}
quicksearch->deferred_free = FALSE;
}
if (search_string == NULL || search_string[0] == '\0') {
}
if (search_string == NULL || search_string[0] == '\0') {
} else {
quicksearch->matcher_list = NULL;
quicksearch_set_active(quicksearch, FALSE);
} else {
quicksearch->matcher_list = NULL;
quicksearch_set_active(quicksearch, FALSE);
return;
}
} else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_TAG) {
return;
}
} else if (prefs_common.summary_quicksearch_type == QUICK_SEARCH_TAG) {
quicksearch->search_string = g_strdup(search_string);
}
quicksearch->search_string = g_strdup(search_string);
}
quicksearch_set_active(quicksearch, TRUE);
}
quicksearch_set_active(quicksearch, TRUE);
}
static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast)
{
static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast)
{
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ gchar *search_string = quicksearch_get_text(quicksearch);
/* add to history */
if (!quicksearch->in_typing && search_string && strlen(search_string) != 0) {
/* add to history */
if (!quicksearch->in_typing && search_string && strlen(search_string) != 0) {
}
prepare_matcher(quicksearch);
}
prepare_matcher(quicksearch);
- if (run_only_if_fast && !quicksearch->is_fast)
+ if (run_only_if_fast && !quicksearch->is_fast) {
+ g_free(search_string);
if (quicksearch->matcher_list == NULL &&
prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED &&
if (quicksearch->matcher_list == NULL &&
prefs_common.summary_quicksearch_type == QUICK_SEARCH_EXTENDED &&
- search_string && strlen(search_string) != 0)
+ search_string && strlen(search_string) != 0) {
+ g_free(search_string);
quicksearch_set_running(quicksearch, TRUE);
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
quicksearch_set_running(quicksearch, TRUE);
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
}
static int searchbar_changed_timeout(void *data)
}
static int searchbar_changed_timeout(void *data)
QuickSearch *quicksearch)
{
if (event && (event->keyval == GDK_Escape)) {
QuickSearch *quicksearch)
{
if (event && (event->keyval == GDK_Escape)) {
quicksearch->in_typing = FALSE;
quicksearch->in_typing = FALSE;
- str = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ str = quicksearch_get_text(quicksearch);
g_return_val_if_fail(str != NULL, TRUE);
/* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
g_return_val_if_fail(str != NULL, TRUE);
/* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
gtk_widget_grab_focus(
mainwindow_get_mainwindow()->summaryview->ctree);
}
gtk_widget_grab_focus(
mainwindow_get_mainwindow()->summaryview->ctree);
}
static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
{
QuickSearch *quicksearch = (QuickSearch *)data;
static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
{
QuickSearch *quicksearch = (QuickSearch *)data;
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ gchar *search_string = quicksearch_get_text(quicksearch);
prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
/* Show extended search description button, only when Extended is selected */
update_extended_buttons(quicksearch);
/* Show extended search description button, only when Extended is selected */
update_extended_buttons(quicksearch);
- if (!search_string || strlen(search_string) == 0) {
+ if (!search_string || *(search_string) == 0) {
+ g_free(search_string);
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
{
QuickSearch *quicksearch = (QuickSearch *)data;
gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
{
QuickSearch *quicksearch = (QuickSearch *)data;
gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
- const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
+ gchar *search_string = quicksearch_get_text(quicksearch);
prefs_common.summary_quicksearch_recurse = checked;
/* reselect the search type */
quicksearch_set_type(quicksearch, prefs_common.summary_quicksearch_type);
prefs_common.summary_quicksearch_recurse = checked;
/* reselect the search type */
quicksearch_set_type(quicksearch, prefs_common.summary_quicksearch_type);
- if (!search_string || strlen(search_string) == 0) {
+ if (!search_string || *(search_string) == 0) {
+ g_free(search_string);
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
if (quicksearch->callback != NULL)
quicksearch->callback(quicksearch, quicksearch->callback_data);
quicksearch_set_running(quicksearch, FALSE);
static gboolean search_condition_expr(GtkMenuItem *widget, gpointer data)
{
static gboolean search_condition_expr(GtkMenuItem *widget, gpointer data)
{
- const gchar * cond_str;
MatcherList * matchers = NULL;
g_return_val_if_fail(
MatcherList * matchers = NULL;
g_return_val_if_fail(
/* re-use the current quicksearch value if it's a condition expression,
otherwise ignore it silently */
/* re-use the current quicksearch value if it's a condition expression,
otherwise ignore it silently */
- cond_str = gtk_entry_get_text(
- GTK_ENTRY(GTK_BIN(mainwindow_get_mainwindow()->summaryview->quicksearch->
- search_string_entry)->child));
+ cond_str = quicksearch_get_text(mainwindow_get_mainwindow()->summaryview->quicksearch);
+
if (*cond_str != '\0') {
matchers = matcher_parser_get_cond((gchar*)cond_str, NULL);
}
if (*cond_str != '\0') {
matchers = matcher_parser_get_cond((gchar*)cond_str, NULL);
}
if (matchers != NULL)
matcherlist_free(matchers);
if (matchers != NULL)
matcherlist_free(matchers);