New show toolbar button in editor (fixes NB#152559).

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

diff --git a/src/widgets/modest-accounts-window.c b/src/widgets/modest-accounts-window.c
index bcc81ad..2a46f28 100644 (file)
--- a/src/widgets/modest-accounts-window.c
+++ b/src/widgets/modest-accounts-window.c
@@ -83,9 +83,11 @@ static void on_row_deleted (GtkTreeModel *tree_model,
                            GtkTreePath  *path,
                            gpointer      user_data);
 static void row_count_changed (ModestAccountsWindow *self);
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean on_key_press(GtkWidget *widget,
-                               GdkEventKey *event,
-                               gpointer user_data);
+                            GdkEventKey *event,
+                            gpointer user_data);
+#endif
 static gboolean on_delete_event (GtkWidget *widget,
                                 GdkEvent *event,
                                 gpointer userdata);
@@ -136,7 +138,7 @@ modest_accounts_window_get_type (void)
 #ifdef MODEST_TOOLKIT_HILDON2
                                                  MODEST_TYPE_HILDON2_WINDOW,
 #else
-                                                 MODEST_TYPE_WINDOW,
+                                                 MODEST_TYPE_SHELL_WINDOW,
 #endif
                                                  "ModestAccountsWindow",
                                                  &my_info, 0);
@@ -171,9 +173,6 @@ modest_accounts_window_instance_init (ModestAccountsWindow *obj)
        priv->account_view = NULL;
        priv->progress_hint = FALSE;
        
-       modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
-                                           GTK_WINDOW(obj),
-                                           "applications_email_accountsview");
 }
 
 static void
@@ -250,9 +249,10 @@ connect_signals (ModestAccountsWindow *self)
        /* we don't register this in sighandlers, as it should be run
         * after disconnecting all signals, in destroy stage */
 
-
+#ifdef MODEST_TOOLKIT_HILDON2
        g_signal_connect(G_OBJECT(self), "key-press-event",
                        G_CALLBACK(on_key_press), self);
+#endif
 }
 
 static ModestWindow *
@@ -489,6 +489,7 @@ on_account_activated (GtkTreeView *account_view,
        } else {
 
                new_window = GTK_WIDGET (modest_folder_window_new (NULL));
+               modest_window_set_active_account (MODEST_WINDOW (new_window), account_name);
        }
 
        registered = modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
@@ -703,7 +704,7 @@ modest_accounts_window_pre_create (void)
        }
 }
 
-
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean
 on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 {
@@ -730,6 +731,7 @@ on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
 
        return FALSE;
 }
+#endif
 
 static gboolean
 on_delete_event (GtkWidget *widget,