aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/e-mail-reader.c2
-rw-r--r--mail/em-folder-tree-model.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/mail/e-mail-reader.c b/mail/e-mail-reader.c
index edea7cfa6f..9f07ae32a0 100644
--- a/mail/e-mail-reader.c
+++ b/mail/e-mail-reader.c
@@ -331,7 +331,7 @@ action_mail_flag_for_followup_cb (GtkAction *action,
folder = message_list->folder;
uids = message_list_get_selected (message_list);
- em_utils_flag_for_followup (window, folder, uids);
+ em_utils_flag_for_followup (reader, folder, uids);
}
static void
diff --git a/mail/em-folder-tree-model.c b/mail/em-folder-tree-model.c
index d7c5261a7c..9c3ef60397 100644
--- a/mail/em-folder-tree-model.c
+++ b/mail/em-folder-tree-model.c
@@ -311,6 +311,12 @@ folder_tree_model_dispose (GObject *object)
priv = EM_FOLDER_TREE_MODEL_GET_PRIVATE (object);
+ if (priv->shell_backend != NULL) {
+ g_object_remove_weak_pointer (
+ G_OBJECT (priv->shell_backend), &priv->shell_backend);
+ priv->shell_backend = NULL;
+ }
+
if (priv->selection != NULL) {
g_object_weak_unref (
G_OBJECT (priv->selection), (GWeakNotify)