callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

** Fix for bug #360237 & bug #359236

Browse Source 
svn path=/trunk/; revision=32865
This commit is contained in:
Srinivasa Ragavan
2006-10-11 08:26:41 +00:00
parent 01acc2df81
commit 4aa4e4431c
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
widgets/misc/ChangeLog
View File

@ -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.

8
widgets/misc/e-filter-bar.c
View File

@ -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);