2007-07-31 Philip Van Hoof <pvanhoof@gnome.org>

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

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 40b0a97..91394bb 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -31,21 +31,29 @@
 #include "modest-window-priv.h"
 #include "modest-ui-actions.h"
 #include "modest-tny-platform-factory.h"
+#include "modest-runtime.h"
+#include "modest-window-mgr.h"
 
 /* 'private'/'protected' functions */
 static void modest_window_class_init (ModestWindowClass *klass);
 static void modest_window_init       (ModestWindow *obj);
 static void modest_window_finalize   (GObject *obj);
 
-static void        modest_window_set_zoom_default       (ModestWindow *window,
-                                                        gdouble zoom);
-static gdouble     modest_window_get_zoom_default       (ModestWindow *window);
-static gboolean    modest_window_zoom_plus_default      (ModestWindow *window);
-static gboolean    modest_window_zoom_minus_default     (ModestWindow *window);
-static void        modest_window_show_toolbar_default   (ModestWindow *window,
-                                                        gboolean show_toolbar);
+static gdouble  modest_window_get_zoom_default           (ModestWindow *window);
 
-static gboolean    on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data);
+static gboolean modest_window_zoom_plus_default          (ModestWindow *window);
+
+static gboolean modest_window_zoom_minus_default         (ModestWindow *window);
+
+static void     modest_window_disconnect_signals_default (ModestWindow *self);
+
+static void     modest_window_show_toolbar_default       (ModestWindow *window,
+                                                         gboolean show_toolbar);
+
+static void     modest_window_set_zoom_default           (ModestWindow *window,
+                                                         gdouble zoom);
+
+static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data);
 
 
 /* list my signals  */
@@ -104,6 +112,7 @@ modest_window_class_init (ModestWindowClass *klass)
        klass->zoom_plus_func = modest_window_zoom_plus_default;
        klass->zoom_minus_func = modest_window_zoom_minus_default;
        klass->show_toolbar_func = modest_window_show_toolbar_default;
+       klass->disconnect_signals_func = modest_window_disconnect_signals_default;
 
        g_type_class_add_private (gobject_class, sizeof(ModestWindowPrivate));
 }
@@ -263,6 +272,12 @@ modest_window_show_toolbar (ModestWindow *window,
                                                             show_toolbar);
 }
 
+void 
+modest_window_disconnect_signals (ModestWindow *window)
+{
+       MODEST_WINDOW_GET_CLASS (window)->disconnect_signals_func (window);
+}
+
 
 /* Default implementations */
 
@@ -302,7 +317,11 @@ modest_window_show_toolbar_default (ModestWindow *window,
        g_warning ("modest: You should implement %s", __FUNCTION__);
 }
 
-
+static void 
+modest_window_disconnect_signals_default (ModestWindow *self)
+{
+       g_warning ("modest: You should implement %s", __FUNCTION__);
+}
 
 void
 modest_window_save_state (ModestWindow *window)
@@ -317,6 +336,10 @@ on_key_pressed (GtkWidget *self,
                GdkEventKey *event,
                gpointer user_data)
 {
+       ModestWindowMgr *mgr = NULL;
+
+       mgr = modest_runtime_get_window_mgr ();
+
        switch (event->keyval) {
        case GDK_F6: 
                modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
@@ -328,7 +351,10 @@ on_key_pressed (GtkWidget *self,
                modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
                return TRUE;
        case GDK_Escape: 
-               modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
+               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)||MODEST_IS_MSG_EDIT_WINDOW (self))
+                       modest_ui_actions_on_close_window (NULL, MODEST_WINDOW (self));
                break;
        }