/* state bar */
ContentsState contents_state;
- TnyFolder *folder;
-
/* autoscroll */
gboolean autoscroll;
/* signals */
GSList *sighandlers;
gulong queue_change_handler;
+ gulong sort_column_handler;
/* progress hint */
gboolean progress_hint;
priv->top_vbox = NULL;
priv->contents_view = NULL;
priv->contents_state = CONTENTS_STATE_NONE;
- priv->folder = NULL;
priv->updating_banner = NULL;
priv->updating_banner_timeout = 0;
priv->autoscroll = TRUE;
priv->progress_hint = FALSE;
priv->queue_change_handler = 0;
+ priv->sort_column_handler = 0;
priv->current_store_account = NULL;
priv->sort_button = NULL;
priv->new_message_button = NULL;
modest_header_window_finalize (GObject *obj)
{
ModestHeaderWindowPrivate *priv;
+ TnyFolder *folder;
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(obj);
- tny_folder_sync_async (TNY_FOLDER (priv->folder),
- FALSE, NULL, NULL, NULL);
+ 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->folder);
g_object_unref (priv->header_view);
g_object_unref (priv->empty_view);
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;
modest_header_window_disconnect_signals (ModestWindow *self)
{
ModestHeaderWindowPrivate *priv;
+
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
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;
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 */
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),
}
}
+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);
+
+ 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;
+ }
+}
+
+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 (!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);
+ g_object_weak_ref ((GObject *) model, on_header_view_model_destroyed, self);
+}
+
static GtkWidget *
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);
+
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),
self = MODEST_HEADER_WINDOW(g_object_new(MODEST_TYPE_HEADER_WINDOW, NULL));
priv = MODEST_HEADER_WINDOW_GET_PRIVATE(self);
- priv->folder = g_object_ref (folder);
-
priv->contents_view = hildon_pannable_area_new ();
alignment = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
gtk_alignment_set_padding (GTK_ALIGNMENT (alignment),
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_move_messages"), NULL,
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
+ dngettext(GETTEXT_PACKAGE,
+ "mcen_me_move_message",
+ "mcen_me_move_messages",
+ 2),
+ NULL,
APP_MENU_CALLBACK (set_moveto_edit_mode),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_move_to));
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_delete_messages"), NULL,
priv->sort_button = hildon_button_new (MODEST_EDITABLE_SIZE,
HILDON_BUTTON_ARRANGEMENT_VERTICAL);
hildon_button_set_title (HILDON_BUTTON (priv->sort_button), _("mcen_me_sort"));
- g_signal_connect (G_OBJECT (priv->sort_button), "clicked",
- G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self);
+ g_signal_connect_after (G_OBJECT (priv->sort_button), "clicked",
+ G_CALLBACK (modest_ui_actions_on_sort), (gpointer) self);
hildon_button_set_style(HILDON_BUTTON (priv->sort_button), HILDON_BUTTON_STYLE_PICKER);
hildon_button_set_title_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
hildon_button_set_value_alignment (HILDON_BUTTON (priv->sort_button), 0.5, 0.5);
gboolean refilter = FALSE;
gboolean folder_empty = FALSE;
gboolean all_marked_as_deleted = FALSE;
+ TnyFolder *folder;
g_return_if_fail (MODEST_IS_HEADER_WINDOW(self));
priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
- g_return_if_fail (priv->folder);
+
+ folder = modest_header_view_get_folder ((ModestHeaderView *) priv->header_view);
+ if (!folder)
+ return;
if (change != NULL) {
TnyFolderChangeChanged changed;
if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT)
folder_empty = (((guint) tny_folder_change_get_new_all_count (change)) == 0);
else
- folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (priv->folder))) == 0);
+ folder_empty = (((guint) tny_folder_get_all_count (folder)) == 0);
if ((changed) & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS)
refilter = TRUE;
} else {
- folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (priv->folder))) == 0);
+ folder_empty = (((guint) tny_folder_get_all_count (folder)) == 0);
}
+ g_object_unref (folder);
/* Check if all messages are marked to be deleted */
all_marked_as_deleted = modest_header_view_is_empty (MODEST_HEADER_VIEW (priv->header_view));
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,
projects / modest / blobdiff