Fix gtk find toolbar as it didn't have proper "show"

[modest] / src / widgets / modest-folder-window.c

diff --git a/src/widgets/modest-folder-window.c b/src/widgets/modest-folder-window.c
index e6c1ae7..e99010f 100644 (file)
--- a/src/widgets/modest-folder-window.c
+++ b/src/widgets/modest-folder-window.c
@@ -115,9 +115,11 @@ static void on_visible_account_changed (ModestFolderView *folder_view,
 static void on_account_changed (TnyAccountStore *account_store,
                                TnyAccount *account,
                                gpointer user_data);
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean on_key_press(GtkWidget *widget,
-                               GdkEventKey *event,
-                               gpointer user_data);
+                            GdkEventKey *event,
+                            gpointer user_data);
+#endif
 
 typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate;
 struct _ModestFolderWindowPrivate {
@@ -323,8 +325,10 @@ connect_signals (ModestFolderWindow *self)
                                                       G_CALLBACK (on_account_changed), self);
 
 
+#ifdef MODEST_TOOLKIT_HILDON2
        g_signal_connect(G_OBJECT(self), "key-press-event",
                        G_CALLBACK(on_key_press), self);
+#endif
 }
 
 ModestWindow *
@@ -334,8 +338,6 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        ModestFolderWindowPrivate *priv = NULL;
        GdkPixbuf *window_icon;
        GtkWidget *scrollable;
-       guint accel_key;
-       GdkModifierType accel_mods;
        GtkWidget *top_alignment;
        
        self  = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
@@ -425,21 +427,21 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
                                                  EDIT_MODE_COMMAND_DELETE,
                                                  _("mcen_ti_edit_folder_delete"), 
-                                                 _HL("wdgt_bd_delete"),
+                                                 _HL_DELETE,
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_delete_folder));
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
                                                  EDIT_MODE_COMMAND_MOVE,
                                                  _("mcen_ti_edit_move_folder"), 
-                                                 _HL("wdgt_bd_move"),
+                                                 _HL_MOVE,
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_move_to)); 
        modest_hildon2_window_register_edit_mode (MODEST_HILDON2_WINDOW (self), 
                                                  EDIT_MODE_COMMAND_RENAME,
                                                  _("mcen_ti_edit_rename_folder"), 
-                                                 _HL("wdgt_bd_rename"),
+                                                 _HL_RENAME,
                                                  GTK_TREE_VIEW (priv->folder_view),
                                                  GTK_SELECTION_SINGLE,
                                                  EDIT_MODE_CALLBACK (modest_ui_actions_on_edit_mode_rename_folder));
@@ -452,6 +454,9 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
 
 #ifdef MODEST_TOOLKIT_HILDON2
        GtkAccelGroup *accel_group;
+       guint accel_key;
+       GdkModifierType accel_mods;
+
        accel_group = gtk_accel_group_new ();
        gtk_accelerator_parse ("<Control>n", &accel_key, &accel_mods);
        gtk_widget_add_accelerator (priv->new_message_button, "clicked", accel_group,
@@ -956,7 +961,7 @@ on_account_changed (TnyAccountStore *account_store,
                update_window_title (MODEST_FOLDER_WINDOW (user_data), account);
 }
 
-
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean
 on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
@@ -983,3 +988,4 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 
        return FALSE;
 }
+#endif