Fixes NB#137624, crash when creating a new folder in offline mode

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

diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 2ceee3d..9abe2b0 100644 (file)
--- a/src/hildon2/modest-header-window.c
+++ b/src/hildon2/modest-header-window.c
@@ -88,6 +88,7 @@ struct _ModestHeaderWindowPrivate {
        GSList *sighandlers;
        gulong queue_change_handler;
        gulong sort_column_handler;
+       gulong notify_model;
 
        /* progress hint */
        gboolean progress_hint;
@@ -174,6 +175,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;
@@ -254,6 +258,7 @@ modest_header_window_init (ModestHeaderWindow *obj)
        priv->new_message_button = NULL;
        priv->x_coord = 0;
        priv->y_coord = 0;
+       priv->notify_model = 0;
 
        modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
                                            GTK_WINDOW(obj),
@@ -315,6 +320,11 @@ modest_header_window_disconnect_signals (ModestWindow *self)
 
        priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
 
+       if (g_signal_handler_is_connected ((GObject*) priv->header_view, priv->notify_model)) {
+               g_signal_handler_disconnect ((GObject*) priv->header_view, priv->notify_model);
+               priv->notify_model = 0;
+       }
+
        if (g_signal_handler_is_connected (G_OBJECT (modest_runtime_get_mail_operation_queue ()), 
                                           priv->queue_change_handler)) {
                g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), 
@@ -404,6 +414,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
@@ -610,8 +624,9 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
        ModestHeaderWindowPrivate *priv;
 
        header_view  = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES);
-       g_signal_connect ((GObject*) header_view, "notify::model",
-                         G_CALLBACK (on_header_view_model_changed), self);
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+       priv->notify_model = g_signal_connect ((GObject*) header_view, "notify::model",
+                                              G_CALLBACK (on_header_view_model_changed), self);
 
        modest_header_view_set_folder (MODEST_HEADER_VIEW (header_view), folder,
                                       TRUE, self, folder_refreshed_cb, self);
@@ -621,7 +636,6 @@ create_header_view (ModestWindow *self, TnyFolder *folder)
                                      MODEST_CONF_HEADER_VIEW_KEY);
 
        /* Create CSM menu */
-       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
        priv->csm_menu = gtk_menu_new ();
        delete_item = gtk_menu_item_new_with_label (_HL("wdgt_bd_delete"));
        mark_read_item = gtk_menu_item_new_with_label (_("mcen_me_inbox_mark_as_read"));
@@ -1461,3 +1475,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;
+}