projects / modest / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Dispose list store in folder view on disposing it.
[modest] / src / hildon2 / modest-header-window.c
diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c
index 3d8e894..6490842 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;
@@ -100,6 +101,9 @@ struct _ModestHeaderWindowPrivate {
        GtkWidget *csm_menu;
        gdouble x_coord;
        gdouble y_coord;
+
+       /* weak refs */
+       GtkTreeModel *model_weak_ref;
 };
 #define MODEST_HEADER_WINDOW_GET_PRIVATE(o)  (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                                          MODEST_TYPE_HEADER_WINDOW, \
@@ -109,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);
@@ -169,6 +174,11 @@ static void on_horizontal_movement (HildonPannableArea *hildonpannable,
                                    gdouble             initial_x,
                                    gdouble             initial_y,
                                    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;
@@ -216,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));
        
@@ -243,11 +254,13 @@ modest_header_window_init (ModestHeaderWindow *obj)
        priv->progress_hint = FALSE;
        priv->queue_change_handler = 0;
        priv->sort_column_handler = 0;
+       priv->model_weak_ref = NULL;
        priv->current_store_account = NULL;
        priv->sort_button = NULL;
        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),
@@ -255,7 +268,7 @@ modest_header_window_init (ModestHeaderWindow *obj)
 }
 
 static void
-modest_header_window_finalize (GObject *obj)
+modest_header_window_dispose (GObject *obj)
 {
        ModestHeaderWindowPrivate *priv;
        TnyFolder *folder;
@@ -268,8 +281,28 @@ modest_header_window_finalize (GObject *obj)
                g_object_unref (folder);
        }
 
-       /* Sanity check: shouldn't be needed, the window mgr should
-          call this function before */
+       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,
+                                    obj);
+               if (g_signal_handler_is_connected (G_OBJECT (priv->model_weak_ref),
+                                                  priv->sort_column_handler)) {
+                       g_signal_handler_disconnect (G_OBJECT (priv->model_weak_ref),
+                                                    priv->sort_column_handler);
+               }
+               on_header_view_model_destroyed (obj, (GObject *) priv->model_weak_ref);
+       }
+
        modest_header_window_disconnect_signals (MODEST_WINDOW (obj));
 
        g_object_unref (priv->header_view);
@@ -299,6 +332,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 ()), 
@@ -310,11 +348,13 @@ modest_header_window_disconnect_signals (ModestWindow *self)
                GtkTreeModel *sortable;
 
                sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view));
-               if (g_signal_handler_is_connected (G_OBJECT (sortable),
-                                                  priv->sort_column_handler)) {
-                       g_signal_handler_disconnect (G_OBJECT (sortable),
-                                                    priv->sort_column_handler);
-                       priv->sort_column_handler = 0;
+               if (sortable) {
+                       if (g_signal_handler_is_connected (G_OBJECT (sortable),
+                                                          priv->sort_column_handler)) {
+                               g_signal_handler_disconnect (G_OBJECT (sortable),
+                                                            priv->sort_column_handler);
+                               priv->sort_column_handler = 0;
+                       }
                }
        }
 
@@ -386,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
@@ -538,15 +582,17 @@ static void
 on_header_view_model_destroyed (gpointer user_data,
                                GObject *model)
 {
-       ModestHeaderWindow *self = (ModestHeaderWindow *) user_data;
-       ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+       ModestHeaderWindow *self;
+       ModestHeaderWindowPrivate *priv;
 
-       if (g_signal_handler_is_connected (G_OBJECT (model),
-                                          priv->sort_column_handler)) {
-               g_signal_handler_disconnect (G_OBJECT (model),
-                                            priv->sort_column_handler);
-               priv->sort_column_handler = 0;
-       }
+       self = (ModestHeaderWindow *) user_data;
+       if (!GTK_IS_WIDGET (self))
+               return;
+
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+       priv->model_weak_ref = NULL;
+
+       priv->sort_column_handler = 0;
 }
 
 static void
@@ -558,6 +604,18 @@ on_header_view_model_changed (GObject *gobject,
        ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
        GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (gobject));
 
+       if (priv->model_weak_ref ) {
+               g_object_weak_unref ((GObject *) priv->model_weak_ref,
+                                    on_header_view_model_destroyed,
+                                    self);
+               if (g_signal_handler_is_connected (G_OBJECT (priv->model_weak_ref),
+                                                  priv->sort_column_handler)) {
+                       g_signal_handler_disconnect (G_OBJECT (priv->model_weak_ref),
+                                                    priv->sort_column_handler);
+               }
+               on_header_view_model_destroyed (self, (GObject *) priv->model_weak_ref);
+       }
+
        if (!model)
                return;
 
@@ -566,6 +624,7 @@ on_header_view_model_changed (GObject *gobject,
                                                      "sort-column-changed",
                                                      G_CALLBACK (on_sort_column_changed),
                                                      self);
+       priv->model_weak_ref = model;
        g_object_weak_ref ((GObject *) model, on_header_view_model_destroyed, self);
 }
 
@@ -577,8 +636,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);
@@ -588,7 +648,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"));
@@ -1428,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;
+}
"modest" is a lean & mean e-mail program.