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

Package bugfix release 2.8.1.1

Browse Source 
git-svn-id: file:///svn/pkg-evolution/experimental/evolution@668 ed03ce00-e4f4-0310-9448-ee38221cb277
This commit is contained in:
Øystein Gisnås
2006-10-29 11:48:28 +00:00
parent f863736ff3
commit 7afe171460
2 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
evolution (2.8.1.1-1) UNRELEASED; urgency=low
* New upstream release (closes: #347645)
- included: debian/patches/20_show-deleted-msgs-in-trash.patch
-- Oystein Gisnas <oystein@gisnas.net> Sun, 29 Oct 2006 00:30:44 +0200
evolution (2.8.1-2) experimental; urgency=low
* Pull patch from upstream (closes: #391250)

32
debian/patches/20_show-deleted-msgs-in-trash.patch vendored
View File

@ -1,32 +0,0 @@
diff -urN evolution-2.8.1.orig/widgets/misc/e-filter-bar.c evolution-2.8.1/widgets/misc/e-filter-bar.c
--- evolution-2.8.1.orig/widgets/misc/e-filter-bar.c 2006-10-12 00:19:09.097397000 +0200
+++ evolution-2.8.1/widgets/misc/e-filter-bar.c 2006-10-12 00:19:29.334662250 +0200
@@ -120,7 +120,7 @@
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 @@
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 @@
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);