X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-header-window.c;h=649084287fbe3ed022bc081fea3c61552c185421;hb=f72625d1ed94546d9c8bc8cdaffab6fa1a88f854;hp=e5602c5b2a1fbc04d106c84d7efb774fc9e5741c;hpb=e37773399d98b5b959b0481bf3e2b8cbd9a30f34;p=modest diff --git a/src/hildon2/modest-header-window.c b/src/hildon2/modest-header-window.c index e5602c5..6490842 100644 --- a/src/hildon2/modest-header-window.c +++ b/src/hildon2/modest-header-window.c @@ -87,6 +87,8 @@ struct _ModestHeaderWindowPrivate { /* signals */ GSList *sighandlers; gulong queue_change_handler; + gulong sort_column_handler; + gulong notify_model; /* progress hint */ gboolean progress_hint; @@ -99,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, \ @@ -108,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); @@ -168,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; @@ -215,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)); @@ -241,11 +253,14 @@ modest_header_window_init (ModestHeaderWindow *obj) priv->autoscroll = TRUE; 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), @@ -253,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; @@ -266,6 +281,30 @@ modest_header_window_finalize (GObject *obj) 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, + 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); g_object_unref (priv->empty_view); @@ -274,10 +313,6 @@ modest_header_window_finalize (GObject *obj) priv->current_store_account = NULL; } - /* Sanity check: shouldn't be needed, the window mgr should - call this function before */ - modest_header_window_disconnect_signals (MODEST_WINDOW (obj)); - if (priv->updating_banner_timeout > 0) { g_source_remove (priv->updating_banner_timeout); priv->updating_banner_timeout = 0; @@ -294,12 +329,34 @@ static void modest_header_window_disconnect_signals (ModestWindow *self) { ModestHeaderWindowPrivate *priv; + 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)) + priv->queue_change_handler)) { g_signal_handler_disconnect (G_OBJECT (modest_runtime_get_mail_operation_queue ()), priv->queue_change_handler); + priv->queue_change_handler = 0; + } + + if (priv->header_view) { + GtkTreeModel *sortable; + + sortable = gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view)); + 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; + } + } + } modest_signal_mgr_disconnect_all_and_destroy (priv->sighandlers); priv->sighandlers = NULL; @@ -308,11 +365,8 @@ modest_header_window_disconnect_signals (ModestWindow *self) static void connect_signals (ModestHeaderWindow *self) -{ - ModestHeaderWindowPrivate *priv; - GtkTreeSortable *sortable; - - priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); +{ + ModestHeaderWindowPrivate *priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self); /* header view */ @@ -337,15 +391,6 @@ connect_signals (ModestHeaderWindow *self) G_CALLBACK (on_expose_event), self); - sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view))); - - priv->sighandlers = - modest_signal_mgr_connect (priv->sighandlers, - G_OBJECT (sortable), - "sort-column-changed", - G_CALLBACK (on_sort_column_changed), - self); - priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (self), @@ -381,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 @@ -529,6 +578,56 @@ on_mark_unread_csm_activated (GtkMenuItem *item, } } +static void +on_header_view_model_destroyed (gpointer user_data, + GObject *model) +{ + ModestHeaderWindow *self; + ModestHeaderWindowPrivate *priv; + + 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 +on_header_view_model_changed (GObject *gobject, + GParamSpec *arg1, + gpointer user_data) +{ + ModestHeaderWindow *self = (ModestHeaderWindow *) user_data; + 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; + + /* Connect the signal. Listen to object destruction to disconnect it */ + priv->sort_column_handler = g_signal_connect ((GObject *) model, + "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); +} + static GtkWidget * create_header_view (ModestWindow *self, TnyFolder *folder) { @@ -537,6 +636,10 @@ create_header_view (ModestWindow *self, TnyFolder *folder) ModestHeaderWindowPrivate *priv; header_view = modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES); + 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); modest_header_view_set_filter (MODEST_HEADER_VIEW (header_view), @@ -545,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")); @@ -1290,6 +1392,12 @@ update_sort_button (ModestHeaderWindow *self) const gchar *value = NULL; priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self); + + /* This could happen as the first time the model is set the + header_view is still not assigned to priv->header_view */ + if (!priv->header_view) + return; + sortable = GTK_TREE_SORTABLE (gtk_tree_view_get_model (GTK_TREE_VIEW (priv->header_view))); if (!gtk_tree_sortable_get_sort_column_id (sortable, @@ -1379,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; +}