aboutsummaryrefslogtreecommitdiffstats
path: root/widgets
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2009-02-15 11:27:31 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2009-02-15 11:27:31 +0800
commitf7e298665b02f72890c6681e6d21ef5601beccbb (patch)
tree4df0be16faf8d03b1881bd5f9e89280195ec341c /widgets
parentccd8e3964f548798eb05a430b3ea81b2760069cc (diff)
downloadgsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.gz
gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.tar.zst
gsoc2013-evolution-f7e298665b02f72890c6681e6d21ef5601beccbb.zip
Merge revisions 37200:3266 from trunk.
svn path=/branches/kill-bonobo/; revision=37270
Diffstat (limited to 'widgets')
-rw-r--r--widgets/misc/ChangeLog8
-rw-r--r--widgets/misc/e-filter-bar.c3
-rw-r--r--widgets/misc/e-unicode.c2
3 files changed, 11 insertions, 2 deletions
diff --git a/widgets/misc/ChangeLog b/widgets/misc/ChangeLog
index 2c1046f0a6..d81e52d0a1 100644
--- a/widgets/misc/ChangeLog
+++ b/widgets/misc/ChangeLog
@@ -1,3 +1,11 @@
+2009-02-12 Milan Crha <mcrha@redhat.com>
+
+ ** Part of fix for bug #404232
+
+ * e-filter-bar.c: (rule_advanced_response): Emit signal after
+ search bar text is set, thus the text will not be empty, which
+ is considered as "no search" these days.
+
2009-01-30 Suman Manjunath <msuman@novell.com>
** Fix for bug #342446
diff --git a/widgets/misc/e-filter-bar.c b/widgets/misc/e-filter-bar.c
index c662460aba..21901b631a 100644
--- a/widgets/misc/e-filter-bar.c
+++ b/widgets/misc/e-filter-bar.c
@@ -73,7 +73,6 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data)
filter_bar->current_query = rule;
g_object_ref (rule);
- g_signal_emit_by_name (filter_bar, "search_activated");
gtk_widget_modify_base (search_bar->entry, GTK_STATE_NORMAL, &(style->base[GTK_STATE_SELECTED]));
gtk_widget_modify_text (search_bar->entry, GTK_STATE_NORMAL, &(style->text[GTK_STATE_SELECTED]));
@@ -82,6 +81,8 @@ rule_advanced_response (GtkWidget *dialog, int response, void *data)
e_search_bar_set_text (search_bar,_("Advanced Search"));
gtk_widget_set_sensitive (search_bar->clear_button, TRUE);
+ g_signal_emit_by_name (efb, "search_activated");
+
if (response == GTK_RESPONSE_APPLY) {
if (!rule_context_find_rule (filter_bar->context, rule->name, rule->source))
rule_context_add_rule (filter_bar->context, rule);
diff --git a/widgets/misc/e-unicode.c b/widgets/misc/e-unicode.c
index a98154dd20..9d660b6600 100644
--- a/widgets/misc/e-unicode.c
+++ b/widgets/misc/e-unicode.c
@@ -46,7 +46,7 @@
#include <glib/gi18n.h>
#include "e-unicode.h"
-#define d(x) x
+#define d(x)
#define FONT_TESTING
#define MAX_DECOMP 8