Removed folder view key press handler for collapse/decollapse as it's

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

diff --git a/src/widgets/modest-folder-window.c b/src/widgets/modest-folder-window.c
index a81e38e..1f62529 100644 (file)
--- a/src/widgets/modest-folder-window.c
+++ b/src/widgets/modest-folder-window.c
@@ -115,16 +115,20 @@ 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 {
 
        GtkWidget *folder_view;
        GtkWidget *top_vbox;
+#ifdef MODEST_TOOLKIT_HILDON2
        GtkWidget *new_message_button;
+#endif
 
        /* signals */
        GSList *sighandlers;
@@ -308,10 +312,12 @@ connect_signals (ModestFolderWindow *self)
                                                       "activity-changed",
                                                       G_CALLBACK (on_activity_changed), self);
 
+#ifdef MODEST_TOOLKIT_HILDON2
        priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
                                                       G_OBJECT (priv->new_message_button),
                                                       "clicked",
                                                       G_CALLBACK (modest_ui_actions_on_new_msg), self);
+#endif
 
        priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
                                                       G_OBJECT (modest_runtime_get_account_store()),
@@ -319,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 *
@@ -332,7 +340,6 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
        GtkWidget *scrollable;
        guint accel_key;
        GdkModifierType accel_mods;
-       GtkAccelGroup *accel_group;
        GtkWidget *top_alignment;
        
        self  = MODEST_FOLDER_WINDOW(g_object_new(MODEST_TYPE_FOLDER_WINDOW, NULL));
@@ -422,21 +429,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));
@@ -447,11 +454,14 @@ modest_folder_window_new (TnyFolderStoreQuery *query)
                          G_OBJECT (self));
        update_progress_hint (self);
 
+#ifdef MODEST_TOOLKIT_HILDON2
+       GtkAccelGroup *accel_group;
        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,
                                    accel_key, accel_mods, 0);
        gtk_window_add_accel_group (GTK_WINDOW (self), accel_group);
+#endif
 
        return MODEST_WINDOW(self);
 }
@@ -564,7 +574,7 @@ setup_menu (ModestFolderWindow *self)
 {
        g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
 
-       /* folders actions */
+       /* folders actions*/
        modest_window_add_to_menu (MODEST_WINDOW (self), _("mcen_me_new_folder"), NULL,
                                   MODEST_WINDOW_MENU_CALLBACK (modest_ui_actions_on_new_folder),
                                   NULL);
@@ -950,7 +960,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)
 {
@@ -977,3 +987,4 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 
        return FALSE;
 }
+#endif