Show other bodies in attachment as other messages.

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

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index c25d5b9..d7e33f9 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -36,11 +36,20 @@
 #include "modest-defs.h"
 #include <string.h> /* for strcmp */
 #include <gdk/gdkkeysyms.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+#include <X11/XKBlib.h>
+#include <X11/Xdmcp.h>
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon-defines.h>
+#endif
 
 /* '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_dispose    (GObject *obj);
 
 static gdouble  modest_window_get_zoom_default           (ModestWindow *window);
 
@@ -57,7 +66,10 @@ static void     modest_window_set_zoom_default           (ModestWindow *window,
                                                          gdouble zoom);
 
 static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data);
-
+static void _make_zoom_buttons_grabeable (GtkWidget* widget);
+static gboolean _modest_window_map_event (GtkWidget *widget,
+                                         GdkEvent *event,
+                                         gpointer userdata);
 
 /* list my signals  */
 enum {
@@ -112,6 +124,7 @@ modest_window_class_init (ModestWindowClass *klass)
        gobject_class = (GObjectClass*) klass;
 
        parent_class            = g_type_class_peek_parent (klass);
+       gobject_class->dispose  = modest_window_dispose;
        gobject_class->finalize = modest_window_finalize;
 
        klass->set_zoom_func = modest_window_set_zoom_default;
@@ -139,11 +152,15 @@ modest_window_init (ModestWindow *obj)
        priv->dimming_state = NULL;
        priv->ui_dimming_enabled = TRUE;
        priv->active_account = NULL;
+       priv->active_mailbox = NULL;
 
        /* Connect signals */
        g_signal_connect (G_OBJECT (obj), 
                          "key-press-event", 
                          G_CALLBACK (on_key_pressed), NULL);
+       g_signal_connect (G_OBJECT (obj), "map-event",
+                         G_CALLBACK (_modest_window_map_event),
+                         G_OBJECT (obj));
 }
 
 static void
@@ -153,18 +170,36 @@ modest_window_finalize (GObject *obj)
 
        priv = MODEST_WINDOW_GET_PRIVATE(obj);
 
+       if (priv->dimming_state != NULL) {
+               g_slice_free (DimmedState, priv->dimming_state);
+               priv->dimming_state = NULL;
+       }
+
+       g_free (priv->active_account);
+       g_free (priv->active_mailbox);
+       
+       G_OBJECT_CLASS(parent_class)->finalize (obj);
+}
+
+static void
+modest_window_dispose (GObject *obj)
+{
+       ModestWindowPrivate *priv;      
+
+       priv = MODEST_WINDOW_GET_PRIVATE(obj);
+
+       priv->ui_dimming_enabled = FALSE;
+
        if (priv->ui_manager) {
                g_object_unref (G_OBJECT(priv->ui_manager));
                priv->ui_manager = NULL;
        }
        if (priv->ui_dimming_manager) {
+               g_object_run_dispose (G_OBJECT (priv->ui_dimming_manager));
                g_object_unref (G_OBJECT(priv->ui_dimming_manager));
                priv->ui_dimming_manager = NULL;
        }
-
-       g_free (priv->active_account);
-       
-       G_OBJECT_CLASS(parent_class)->finalize (obj);
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
 }
 
 
@@ -209,6 +244,31 @@ modest_window_set_active_account (ModestWindow *self, const gchar *active_accoun
        }
 }
 
+const gchar*
+modest_window_get_active_mailbox (ModestWindow *self)
+{
+       g_return_val_if_fail (self, NULL);
+       return MODEST_WINDOW_GET_PRIVATE(self)->active_mailbox;
+}
+
+void
+modest_window_set_active_mailbox (ModestWindow *self, const gchar *active_mailbox)
+{
+       ModestWindowPrivate *priv;
+
+       g_return_if_fail (self);        
+       priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+       if (active_mailbox == priv->active_mailbox)
+               return;
+       else {
+               g_free (priv->active_mailbox);
+               priv->active_mailbox = NULL;
+               if (active_mailbox)
+                       priv->active_mailbox = g_strdup (active_mailbox);
+       }
+}
+
 void
 modest_window_check_dimming_rules (ModestWindow *self)
 {
@@ -420,12 +480,21 @@ on_key_pressed (GtkWidget *self,
        case GDK_F6: 
                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;
+#else
        case GDK_F7: 
                modest_ui_actions_on_zoom_plus (NULL, MODEST_WINDOW(self));
                return TRUE;
        case GDK_F8: 
                modest_ui_actions_on_zoom_minus (NULL, MODEST_WINDOW(self));
                return TRUE;
+#endif
        case GDK_Escape: 
                if (modest_window_mgr_get_fullscreen_mode (mgr))
                        modest_ui_actions_on_change_fullscreen (NULL, MODEST_WINDOW(self));
@@ -436,3 +505,27 @@ on_key_pressed (GtkWidget *self,
        
        return FALSE;
 }
+
+static gboolean 
+_modest_window_map_event (GtkWidget *widget,
+                         GdkEvent *event,
+                         gpointer userdata)
+{
+       _make_zoom_buttons_grabeable (GTK_WIDGET (widget));
+       return FALSE;
+}
+
+static void
+_make_zoom_buttons_grabeable (GtkWidget* widget)
+{
+    GdkDisplay *display;
+    Atom atom;
+    unsigned long val = 1;
+
+    display = gdk_drawable_get_display (widget->window);
+    atom = gdk_x11_get_xatom_by_name_for_display (display, "_HILDON_ZOOM_KEY_ATOM");
+    XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
+                     GDK_WINDOW_XID (widget->window), atom,
+                     XA_INTEGER, 32, PropModeReplace,
+                     (unsigned char *) &val, 1);
+}