version and bug fix info update for week 42, 2009 first release

[modest] / src / hildon2 / modest-header-window.c

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 76adeaa..6490842 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -113,6 +113,7 @@ struct _ModestHeaderWindowPrivate {
 static void modest_header_window_class_init  (ModestHeaderWindowClass *klass);
 static void modest_header_window_init        (ModestHeaderWindow *obj);
 static void modest_header_window_finalize    (GObject *obj);
+static void modest_header_window_dispose     (GObject *obj);
 
 static void connect_signals (ModestHeaderWindow *self);
 static void modest_header_window_disconnect_signals (ModestWindow *self);
@@ -175,6 +176,9 @@ static void on_horizontal_movement (HildonPannableArea *hildonpannable,
                                    gpointer            user_data);
 static void on_header_view_model_destroyed (gpointer user_data,
                                            GObject *model);
+static gboolean on_key_press(GtkWidget *widget,
+                                       GdkEventKey *event,
+                                       gpointer user_data);
 
 /* globals */
 static GtkWindowClass *parent_class = NULL;
@@ -222,6 +226,7 @@ modest_header_window_class_init (ModestHeaderWindowClass *klass)
 
        parent_class            = g_type_class_peek_parent (klass);
        gobject_class->finalize = modest_header_window_finalize;
+       gobject_class->dispose = modest_header_window_dispose;
 
        g_type_class_add_private (gobject_class, sizeof(ModestHeaderWindowPrivate));
        
@@ -263,13 +268,29 @@ modest_header_window_init (ModestHeaderWindow *obj)
 }
 
 static void
-modest_header_window_finalize (GObject *obj)
+modest_header_window_dispose (GObject *obj)
 {
        ModestHeaderWindowPrivate *priv;
        TnyFolder *folder;
 
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
 
+       folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view);
+       if (folder) {
+               tny_folder_sync_async (folder, FALSE, NULL, NULL, NULL);
+               g_object_unref (folder);
+       }
+
+       G_OBJECT_CLASS(parent_class)->dispose (obj);
+}
+
+static void
+modest_header_window_finalize (GObject *obj)
+{
+       ModestHeaderWindowPrivate *priv;
+
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
+
        if (priv->model_weak_ref) {
                g_object_weak_unref ((GObject *) priv->model_weak_ref,
                                     on_header_view_model_destroyed,
@@ -282,12 +303,6 @@ modest_header_window_finalize (GObject *obj)
                on_header_view_model_destroyed (obj, (GObject *) priv->model_weak_ref);
        }
 
-       folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view);
-       if (folder) {
-               tny_folder_sync_async (folder, FALSE, NULL, NULL, NULL);
-               g_object_unref (folder);
-       }
-
        modest_header_window_disconnect_signals (MODEST_WINDOW (obj));
 
        g_object_unref (priv->header_view);
@@ -411,6 +426,10 @@ connect_signals (ModestHeaderWindow *self)
                                                   G_CALLBACK (on_horizontal_movement),
                                                   self);
        }
+
+
+       g_signal_connect(G_OBJECT(self), "key-press-event",
+                       G_CALLBACK(on_key_press), self);
 }
 
 static void
@@ -1468,3 +1487,35 @@ on_horizontal_movement (HildonPannableArea *hildonpannable,
                g_object_unref (header);
        }
 }
+
+
+static gboolean
+on_key_press(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
+{
+       ModestHeaderWindowPrivate *priv;
+       HildonPannableArea *pannable;
+       /* FIXME: set scroll_speed depends on for how long the key was pressed */
+       gint scroll_speed = 3;
+
+       if (event->type == GDK_KEY_RELEASE)
+               return FALSE;
+
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE(user_data);
+
+       pannable = HILDON_PANNABLE_AREA (priv->contents_view);
+
+       switch (event->keyval) {
+
+       case GDK_Up:
+               priv->autoscroll = FALSE;
+               modest_maemo_utils_scroll_pannable(pannable, 0, -scroll_speed);
+               break;
+
+       case GDK_Down:
+               priv->autoscroll = FALSE;
+               modest_maemo_utils_scroll_pannable(pannable, 0, scroll_speed);
+               break;
+       }
+
+       return FALSE;
+}