Fixes Zoom keys behaviour in Modest

Fixes NB#144441, "unable to zoom" shown in email inbox while mediaplayer is active
Fixes NB#134194, "volume %x" shown when attempt to zoom
Fixes NB#150401, usage of zoom keys should be revised in email

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 456296e..fefb87f 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -71,6 +71,10 @@
 #include <tny-camel-msg.h>
 #include <tny-camel-bs-mime-part.h>
 #include <tny-camel-bs-msg.h>
 #include <tny-camel-msg.h>
 #include <tny-camel-bs-mime-part.h>
 #include <tny-camel-bs-msg.h>

+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+#include <X11/XKBlib.h>
+#include <X11/Xdmcp.h>

 
 #define MYDOCS_ENV "MYDOCSDIR"
 #define DOCS_FOLDER ".documents"
 
 #define MYDOCS_ENV "MYDOCSDIR"
 #define DOCS_FOLDER ".documents"

@@ -237,6 +241,9 @@ static gboolean _modest_msg_view_window_map_event (GtkWidget *widget,
 static void update_branding (ModestMsgViewWindow *self);
 static void sync_flags      (ModestMsgViewWindow *self);
 
 static void update_branding (ModestMsgViewWindow *self);
 static void sync_flags      (ModestMsgViewWindow *self);
 

+static gboolean on_realize (GtkWidget *widget,
+                           gpointer userdata);
+

 /* list my signals */
 enum {
        MSG_CHANGED_SIGNAL,
 /* list my signals */
 enum {
        MSG_CHANGED_SIGNAL,

@@ -483,15 +490,20 @@ modest_msg_view_window_init (ModestMsgViewWindow *obj)
        priv->remove_attachment_banner = NULL;
        priv->msg_uid = NULL;
        priv->other_body = NULL;
        priv->remove_attachment_banner = NULL;
        priv->msg_uid = NULL;
        priv->other_body = NULL;

-       
+

        priv->sighandlers = NULL;
        priv->sighandlers = NULL;

-       
+

        /* Init window */
        init_window (MODEST_MSG_VIEW_WINDOW(obj));
        /* Init window */
        init_window (MODEST_MSG_VIEW_WINDOW(obj));

-       
+

        hildon_program_add_window (hildon_program_get_instance(),
                                   HILDON_WINDOW(obj));
 
        hildon_program_add_window (hildon_program_get_instance(),
                                   HILDON_WINDOW(obj));
 

+       /* Grab the zoom keys, it will be used for Zoom and not for
+          changing volume */
+       g_signal_connect (G_OBJECT (obj), "realize",
+                         G_CALLBACK (on_realize),
+                         NULL);

 }
 
 static void
 }
 
 static void

@@ -4089,3 +4101,21 @@ sync_flags (ModestMsgViewWindow *self)
                g_object_unref (header);
        }
 }
                g_object_unref (header);
        }
 }

+
+static gboolean
+on_realize (GtkWidget *widget,
+           gpointer userdata)
+{
+       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);
+
+       return FALSE;
+}

diff --git a/src/widgets/modest-window.c b/src/widgets/modest-window.c
index 3f636f2..b664960 100644 (file)
--- a/src/widgets/modest-window.c
+++ b/src/widgets/modest-window.c
@@ -66,10 +66,6 @@ static void     modest_window_set_zoom_default           (ModestWindow *window,
                                                          gdouble zoom);
 
 static gboolean on_key_pressed (GtkWidget *self, GdkEventKey *event, gpointer user_data);
                                                          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 {
 
 /* list my signals  */
 enum {

@@ -158,9 +154,6 @@ modest_window_init (ModestWindow *obj)
        g_signal_connect (G_OBJECT (obj), 
                          "key-press-event", 
                          G_CALLBACK (on_key_pressed), NULL);
        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
 }
 
 static void

@@ -512,27 +505,3 @@ on_key_pressed (GtkWidget *self,
        
        return FALSE;
 }
        
        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);
-}