From bd6e918d77f1d8a9a5dda9b6e0cfba3e6cb58fc1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Dapena=20Paz?= Date: Tue, 2 Feb 2010 18:03:39 +0100 Subject: [PATCH] If live search is enabled, don't use find toolbar in header window --- src/hildon2/modest-header-window.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index 5d94a8a..c387674 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -185,13 +185,15 @@ static gboolean on_key_press(GtkWidget *widget, gpointer user_data); static void modest_header_window_show_more (GtkAction *action, ModestWindow *win); -static void show_isearch_toolbar (GtkWidget *obj, gpointer data); static void isearch_toolbar_close (GtkWidget *widget, ModestHeaderWindow *obj); static void isearch_toolbar_search (GtkWidget *widget, ModestHeaderWindow *obj); +#ifndef MODEST_TOOLKIT_HILDON2 +static void show_isearch_toolbar (GtkWidget *obj, gpointer data); static void toggle_isearch_toolbar (GtkWidget *obj, gpointer data); +#endif /* globals */ @@ -1019,8 +1021,10 @@ static void setup_menu (ModestHeaderWindow *self) modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL, APP_MENU_CALLBACK (modest_ui_actions_cancel_send), MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all)); +#ifndef MODEST_TOOLKIT_HILDON2 modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _HL("wdgt_bd_search"), NULL, APP_MENU_CALLBACK (toggle_isearch_toolbar), NULL); +#endif } static void @@ -1651,6 +1655,7 @@ modest_header_window_show_more (GtkAction *action, ModestWindow *win) } } +#ifndef MODEST_TOOLKIT_HILDON2 /* Used for the Ctrl+F accelerator */ static void toggle_isearch_toolbar (GtkWidget *obj, @@ -1677,6 +1682,7 @@ show_isearch_toolbar (GtkWidget *obj, gtk_widget_show (priv->isearch_toolbar); hildon_find_toolbar_highlight_entry (HILDON_FIND_TOOLBAR (priv->isearch_toolbar), TRUE); } +#endif /* Handler for click on the "X" close button in isearch toolbar */ static void -- 1.7.9.5