Set active account of folder window before registering, to allow

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

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index c17e501..1fdb139 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -89,6 +89,10 @@ static void _make_zoom_buttons_grabeable (GtkWidget* widget);
 static gboolean _modest_window_map_event (GtkWidget *widget,
                                          GdkEvent *event,
                                          gpointer userdata);
+static void modest_window_pack_toolbar_not_implemented (ModestWindow *self,
+                                                       GtkPackType pack_type,
+                                                       GtkWidget *toolbar);
+
 
 /* list my signals  */
 enum {
@@ -126,7 +130,7 @@ modest_window_get_type (void)
                parent_type = HILDON_TYPE_WINDOW;
 #endif
 #else
-               parent_type = GTK_TYPE_WINDOW;
+               parent_type = GTK_TYPE_VBOX;
 #endif 
                my_type = g_type_register_static (parent_type,
                                                  "ModestWindow",
@@ -157,6 +161,7 @@ modest_window_class_init (ModestWindowClass *klass)
        klass->set_title_func = modest_window_set_title_default;
        klass->disconnect_signals_func = modest_window_disconnect_signals_default;
        klass->show_progress_func = modest_window_show_progress_default;
+       klass->pack_toolbar_func = modest_window_pack_toolbar_not_implemented;
 
        g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate));
 }
@@ -169,7 +174,7 @@ modest_window_init (ModestWindow *obj)
        priv = MODEST_WINDOW_GET_PRIVATE(obj);
 
        priv->ui_manager     = NULL;
-       priv->ui_dimming_manager     = NULL;
+       priv->ui_dimming_manager     = modest_ui_dimming_manager_new ();
        priv->toolbar        = NULL;
        priv->menubar        = NULL;
 
@@ -590,12 +595,18 @@ on_key_pressed (GtkWidget *self,
                modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
                return TRUE;
 #ifdef MODEST_TOOLKIT_HILDON2
-       case HILDON_HARDKEY_INCREASE: 
-               modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
-               return TRUE;
-       case HILDON_HARDKEY_DECREASE: 
-               modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
-               return TRUE;
+       case HILDON_HARDKEY_INCREASE:
+               if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+                       modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
+                       return TRUE;
+               }
+               break;
+       case HILDON_HARDKEY_DECREASE:
+               if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+                       modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
+                       return TRUE;
+               }
+               break;
 #else
        case GDK_F7: 
                modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
@@ -605,10 +616,20 @@ on_key_pressed (GtkWidget *self,
                return TRUE;
 #endif
        case GDK_Escape: 
-               if (modest_window_mgr_get_fullscreen_mode (mgr))
+               if (modest_window_mgr_get_fullscreen_mode (mgr)) {
                        modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
-               else if (MODEST_IS_MSG_VIEW_WINDOW (self))
+                       return TRUE;
+               } else {
+#ifdef MODEST_TOOLKIT_HILDON2
+                       if (MODEST_IS_MSG_VIEW_WINDOW (self)) {
+                               modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
+                               return TRUE;
+                       }
+#else
                        modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
+                       return TRUE;
+#endif
+               }
                break;
        }
        
@@ -638,3 +659,24 @@ _make_zoom_buttons_grabeable (GtkWidget* widget)
                      XA_INTEGER, 32, PropModeReplace,
                      (unsigned char *) &val, 1);
 }
+
+static void 
+modest_window_pack_toolbar_not_implemented (ModestWindow *self,
+                                           GtkPackType pack_type,
+                                           GtkWidget *toolbar)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (self));
+
+       g_debug ("%s not implemented", __FUNCTION__);
+}
+
+void
+modest_window_pack_toolbar (ModestWindow *self,
+                           GtkPackType pack_type,
+                           GtkWidget *toolbar)
+{
+       g_return_if_fail (MODEST_IS_WINDOW (self));
+
+       MODEST_WINDOW_GET_CLASS (self)->pack_toolbar_func (self, pack_type, toolbar);
+}
+