diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-10-11 16:26:41 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2006-10-11 16:26:41 +0800 |
| commit | 4aa4e4431cb75f77232e34cabc4b8bc9479ba5da (patch) | |
| tree | 2fbdd564296ba2823aba5534115b615520391e3d | |
| parent | 01acc2df81d66d657a3e2c9a079471e95a112b7f (diff) | |
| download | gsoc2013-evolution-4aa4e4431cb75f77232e34cabc4b8bc9479ba5da.tar gsoc2013-evolution-4aa4e4431cb75f77232e34cabc4b8bc9479ba5da.tar.gz gsoc2013-evolution-4aa4e4431cb75f77232e34cabc4b8bc9479ba5da.tar.bz2 gsoc2013-evolution-4aa4e4431cb75f77232e34cabc4b8bc9479ba5da.tar.lz gsoc2013-evolution-4aa4e4431cb75f77232e34cabc4b8bc9479ba5da.tar.xz gsoc2013-evolution-4aa4e4431cb75f77232e34cabc4b8bc9479ba5da.tar.zst gsoc2013-evolution-4aa4e4431cb75f77232e34cabc4b8bc9479ba5da.zip | |
** Fix for bug #360237 & bug #359236
svn path=/trunk/; revision=32865
| -rw-r--r-- | widgets/misc/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/misc/e-filter-bar.c | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog index d1a78982f5..b81351641a 100644 --- a/widgets/misc/ChangeLog +++ b/widgets/misc/ChangeLog @@ -1,3 +1,10 @@ +2006-10-11 Srinivasa Ragavan <sragavan@novell.com> + + ** Fix for bug #360237 & bug #359236 + + * e-filter-bar.c: (rule_advanced_response), (set_property): Fix for a + crash while saving empty search. + 2006-10-03 Francisco Javier F. Serrador <serrador@tecknolabs.com> * e-dateedit.c: Make two strings translatable. diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c index ce4ebf2658..cc2927d675 100644 --- a/widgets/misc/e-filter-bar.c +++ b/widgets/misc/e-filter-bar.c @@ -120,7 +120,7 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data) efb->current_query = rule; g_object_ref (rule); - g_signal_emit_by_name (efb, "query_changed"); + g_signal_emit_by_name (efb, "search_activated"); gtk_widget_modify_base (esb->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED])); gtk_widget_modify_text (esb->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED])); @@ -684,6 +684,8 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe view_id = xml_get_prop_int (node, "view_id"); scope = xml_get_prop_int (node, "searchscope"); item_id = xml_get_prop_int (node, "item_id"); + if (item_id == -1) + item_id = 0; if (scope == E_FILTERBAR_CURRENT_FOLDER_ID) is_cur_folder = TRUE; @@ -770,7 +772,9 @@ set_property (GObject *object, guint property_id, const GValue *value, GParamSpe gtk_widget_modify_text (((ESearchBar *)efb)->entry, GTK_STATE_NORMAL, NULL); gtk_widget_modify_base (((ESearchBar *)efb)->icon_entry, GTK_STATE_NORMAL, NULL); e_search_bar_paint (esb); - efb->current_query = NULL; + efb->current_query = (FilterRule *)efb->option_rules->pdata[item_id - efb->option_base]; + if (efb->config && efb->current_query) + efb->config (efb, efb->current_query, item_id, "", efb->config_data); } xmlFree (text); |