X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-dimming-rules.c;h=bf6c2b9a391f7ec749ae4390f5b70e02d91de1de;hp=37042ffc46952e57e22f34ae4cfc72ecf3244f2a;hb=f2f85fb554572fa18695ab7b60c6143347c92d92;hpb=266b4d77f35ca1032ae3df2fb9edfc3f89595203 diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 37042ff..bf6c2b9 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -35,6 +35,7 @@ #include "modest-ui-dimming-rules.h" #include "modest-dimming-rule.h" #include "modest-tny-folder.h" +#include "modest-tny-account.h" #include "modest-text-utils.h" #include #include @@ -43,12 +44,14 @@ static gboolean _folder_is_any_of_type (TnyFolder *folder, TnyFolderType types[], guint ntypes); static gboolean _invalid_msg_selected (ModestMainWindow *win, gboolean unique, ModestDimmingRule *rule); -static gboolean _invalid_attach_selected (ModestWindow *win, gboolean unique, gboolean for_view, ModestDimmingRule *rule); +static gboolean _invalid_attach_selected (ModestWindow *win, + gboolean unique, gboolean for_view, gboolean for_remove, + ModestDimmingRule *rule); static gboolean _purged_attach_selected (ModestWindow *win, gboolean all, ModestDimmingRule *rule); static gboolean _clipboard_is_empty (ModestWindow *win); static gboolean _invalid_clipboard_selected (ModestWindow *win, ModestDimmingRule *rule); static gboolean _already_opened_msg (ModestWindow *win, guint *n_messages); -static gboolean _selected_msg_marked_as (ModestWindow *win, TnyHeaderFlags mask, gboolean opposite); +static gboolean _selected_msg_marked_as (ModestWindow *win, TnyHeaderFlags mask, gboolean opposite, gboolean all); static gboolean _selected_folder_not_writeable (ModestMainWindow *win); static gboolean _selected_folder_is_snd_level (ModestMainWindow *win); static gboolean _selected_folder_is_any_of_type (ModestWindow *win, TnyFolderType types[], guint ntypes); @@ -78,7 +81,8 @@ modest_ui_dimming_rules_on_new_msg (ModestWindow *win, gpointer user_data) /* Check dimmed rule */ if (!dimmed) { - dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW(win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW(win)); if (dimmed) modest_dimming_rule_set_notification (rule, ""); } @@ -191,6 +195,13 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data) if (folder_view && gtk_widget_is_focus (folder_view)) dimmed = modest_ui_dimming_rules_on_delete_folder (win, rule); + + if (header_view && folder_view && + !gtk_widget_is_focus (header_view) && + !gtk_widget_is_focus (folder_view)) { + dimmed = TRUE; + modest_dimming_rule_set_notification (rule, dgettext("hildon-common-strings", "ckct_ib_nothing_to_delete")); + } } else { dimmed = modest_ui_dimming_rules_on_delete_folder (win, rule); } @@ -204,7 +215,7 @@ gboolean modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data) { ModestDimmingRule *rule = NULL; - TnyFolderType types[5]; + TnyFolderType types[6]; gboolean dimmed = FALSE; g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); @@ -216,6 +227,7 @@ modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data) types[2] = TNY_FOLDER_TYPE_SENT; types[3] = TNY_FOLDER_TYPE_INBOX; types[4] = TNY_FOLDER_TYPE_ROOT; + types[5] = TNY_FOLDER_TYPE_ARCHIVE; /* Check dimmed rule */ @@ -225,7 +237,7 @@ modest_ui_dimming_rules_on_delete_folder (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error")); } if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 5); + dimmed = _selected_folder_is_any_of_type (win, types, 6); if (dimmed) modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_delete_error")); } @@ -256,8 +268,12 @@ modest_ui_dimming_rules_on_sort (ModestWindow *win, gpointer user_data) /* Check dimmed rule */ if (!dimmed) { dimmed = _selected_folder_is_root (MODEST_MAIN_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); + modest_dimming_rule_set_notification (rule, _CS("ckdg_ib_nothing_to_sort")); + } + + if (!dimmed) { + dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win)); + modest_dimming_rule_set_notification (rule, _CS("ckdg_ib_nothing_to_sort")); } return dimmed; @@ -268,7 +284,7 @@ gboolean modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data) { ModestDimmingRule *rule = NULL; - TnyFolderType types[3]; + TnyFolderType types[4]; gboolean dimmed = FALSE; g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); @@ -278,6 +294,7 @@ modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data) types[0] = TNY_FOLDER_TYPE_DRAFTS; types[1] = TNY_FOLDER_TYPE_OUTBOX; types[2] = TNY_FOLDER_TYPE_SENT; + types[3] = TNY_FOLDER_TYPE_ARCHIVE; /* Check dimmed rule */ if (!dimmed) { @@ -291,7 +308,7 @@ modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, ""); } if (!dimmed) { - dimmed = _selected_folder_is_any_of_type (win, types, 3); + dimmed = _selected_folder_is_any_of_type (win, types, 4); if (dimmed) modest_dimming_rule_set_notification (rule, ""); } @@ -368,9 +385,10 @@ modest_ui_dimming_rules_on_reply_msg (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { - dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW(win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW (win)); if (dimmed) - modest_dimming_rule_set_notification (rule, ""); + modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_reply")); } } @@ -454,7 +472,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) if (!dimmed) { dimmed = _selected_msg_sent_in_progress (win); if (dimmed) - modest_dimming_rule_set_notification (rule, _("ckct_ib_unable_to_delete]")); + modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); } } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { @@ -464,14 +482,14 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { + dimmed = _marked_as_deleted (win); + if (dimmed) + modest_dimming_rule_set_notification (rule, _("mcen_ib_message_already_deleted")); + } + if (!dimmed) { dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW(win)); if (dimmed) { - gchar *num = g_strdup("1"); - gchar *message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), num); -/* modest_dimming_rule_set_notification (rule, _("mcen_nc_unable_to_delete_n_messages")); */ - modest_dimming_rule_set_notification (rule, message); - g_free(message); - g_free(num); + modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete")); } } } @@ -530,7 +548,8 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data) /* Check dimmed rule */ if (!dimmed) { - dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW(win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = _msg_download_in_progress (MODEST_MSG_VIEW_WINDOW (win)); if (dimmed) modest_dimming_rule_set_notification (rule, ""); } @@ -558,7 +577,7 @@ modest_ui_dimming_rules_on_mark_as_read_msg (ModestWindow *win, gpointer user_da dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); } if (!dimmed) { - dimmed = _selected_msg_marked_as (win, flags, FALSE); + dimmed = _selected_msg_marked_as (win, flags, FALSE, TRUE); if (dimmed) modest_dimming_rule_set_notification (rule, ""); } @@ -583,7 +602,7 @@ modest_ui_dimming_rules_on_mark_as_unread_msg (ModestWindow *win, gpointer user_ if (!dimmed) dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data); if (!dimmed) { - dimmed = _selected_msg_marked_as (win, flags, TRUE); + dimmed = _selected_msg_marked_as (win, flags, TRUE, TRUE); if (dimmed) modest_dimming_rule_set_notification (rule, ""); } @@ -665,7 +684,8 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { - dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW(win)); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = !modest_msg_view_window_has_headers_model (MODEST_MSG_VIEW_WINDOW (win)); if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_move_mail_attachment")); } @@ -767,7 +787,7 @@ modest_ui_dimming_rules_on_view_attachments (ModestWindow *win, gpointer user_da /* Check dimmed rule */ if (!dimmed) - dimmed = _invalid_attach_selected (win, TRUE, TRUE, rule); + dimmed = _invalid_attach_selected (win, TRUE, TRUE, FALSE, rule); if (!dimmed) { dimmed = _purged_attach_selected (win, FALSE, NULL); @@ -791,7 +811,7 @@ modest_ui_dimming_rules_on_save_attachments (ModestWindow *win, gpointer user_da /* Check dimmed rule */ if (!dimmed) - dimmed = _invalid_attach_selected (win, FALSE, FALSE, rule); + dimmed = _invalid_attach_selected (win, FALSE, FALSE, FALSE, rule); if (!dimmed) { dimmed = _purged_attach_selected (win, FALSE, NULL); @@ -820,7 +840,7 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_ /* Check in view window if there's any attachment selected */ if (!dimmed && MODEST_IS_MSG_VIEW_WINDOW (win)) { - dimmed = _invalid_attach_selected (win, FALSE, FALSE, NULL); + dimmed = _invalid_attach_selected (win, FALSE, FALSE, TRUE, NULL); if (dimmed) modest_dimming_rule_set_notification (rule, _("FIXME:no attachment selected")); } @@ -832,7 +852,7 @@ modest_ui_dimming_rules_on_remove_attachments (ModestWindow *win, gpointer user_ /* Check if the selected message in main window has attachments */ if (!dimmed && MODEST_IS_MAIN_WINDOW (win)) { - dimmed = _selected_msg_marked_as (win, TNY_HEADER_FLAG_ATTACHMENTS, TRUE); + dimmed = _selected_msg_marked_as (win, TNY_HEADER_FLAG_ATTACHMENTS, TRUE, FALSE); if (dimmed) modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); } @@ -952,9 +972,9 @@ modest_ui_dimming_rules_on_view_previous (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { - dimmed = modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW(win)); + modest_dimming_rule_set_notification (rule, NULL); } return dimmed; @@ -977,9 +997,9 @@ modest_ui_dimming_rules_on_view_next (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("mail_ib_notavailable_downloading")); } if (!dimmed) { - dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW(win)); - if (dimmed) - modest_dimming_rule_set_notification (rule, ""); + if (MODEST_IS_MSG_VIEW_WINDOW (win)) + dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW (win)); + modest_dimming_rule_set_notification (rule, NULL); } return dimmed; @@ -1023,7 +1043,7 @@ modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data } if (!dimmed) { dimmed = !_sending_in_progress (win); - if (dimmed) + if (dimmed) modest_dimming_rule_set_notification (rule, ""); } @@ -1079,12 +1099,10 @@ _marked_as_deleted (ModestWindow *win) gboolean result = FALSE; TnyHeaderFlags flags; - g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); - flags = TNY_HEADER_FLAG_DELETED; /* Check dimmed rule */ - result = _selected_msg_marked_as (win, flags, FALSE); + result = _selected_msg_marked_as (win, flags, FALSE, FALSE); return result; } @@ -1155,6 +1173,24 @@ _selected_folder_is_root (ModestMainWindow *win) g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE); + /* All accounts are root items: */ + GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), + MODEST_WIDGET_TYPE_FOLDER_VIEW); + if (folder_view) { + gboolean is_account = FALSE; + TnyFolderStore *folder_store = + modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view)); + if (folder_store) { + is_account = TNY_IS_ACCOUNT (folder_store); + g_object_unref (folder_store); + folder_store = NULL; + } + + if (is_account) + return TRUE; + } + + /* Try something more precise: */ types[0] = TNY_FOLDER_TYPE_ROOT; /* Check folder type */ @@ -1204,8 +1240,6 @@ _selected_folder_is_MMC_or_POP_root (ModestMainWindow *win) } - - static gboolean _selected_folder_is_empty (ModestMainWindow *win) { @@ -1291,7 +1325,7 @@ _selected_folder_is_any_of_type (ModestWindow *win, guint i=0; gboolean result = FALSE; - /*Get curent folder */ + /*Get current folder */ if (MODEST_IS_MAIN_WINDOW(win)) { /* Get folder view */ @@ -1339,11 +1373,8 @@ _folder_is_any_of_type (TnyFolder *folder, g_return_val_if_fail (TNY_IS_FOLDER(folder), FALSE); /* Get folder type */ - if (modest_tny_folder_is_local_folder (folder)) - folder_type = modest_tny_folder_get_local_folder_type (folder); - else - folder_type = modest_tny_folder_guess_folder_type (folder); - + folder_type = modest_tny_folder_guess_folder_type (folder); + /* Check foler type */ for (i=0; i < ntypes; i++) { result = result || folder_type == types[i]; @@ -1456,6 +1487,7 @@ static gboolean _invalid_attach_selected (ModestWindow *win, gboolean unique, gboolean for_view, + gboolean for_remove, ModestDimmingRule *rule) { GList *attachments, *node; @@ -1468,7 +1500,7 @@ _invalid_attach_selected (ModestWindow *win, if (MODEST_IS_MAIN_WINDOW (win)) { flags = TNY_HEADER_FLAG_ATTACHMENTS; if (!result) - result = _selected_msg_marked_as (win, flags, TRUE); + result = _selected_msg_marked_as (win, flags, TRUE, FALSE); } else if (MODEST_IS_MSG_VIEW_WINDOW (win)) { @@ -1490,14 +1522,14 @@ _invalid_attach_selected (ModestWindow *win, for (node = attachments; node != NULL && !result; node = g_list_next (node)) { TnyMimePart *mime_part = TNY_MIME_PART (node->data); TnyList *nested_list = tny_simple_list_new (); - if (TNY_IS_MSG (mime_part)) { + if (!for_remove && TNY_IS_MSG (mime_part)) { selected_messages = TRUE; result = TRUE; } tny_mime_part_get_parts (mime_part, nested_list); - if (tny_list_get_length (nested_list) > 0) { - nested_attachments = TRUE; - result = TRUE; + if (!for_remove && tny_list_get_length (nested_list) > 0) { + nested_attachments = TRUE; + result = TRUE; } g_object_unref (nested_list); } @@ -1644,9 +1676,12 @@ _already_opened_msg (ModestWindow *win, found = FALSE; while (!tny_iterator_is_done (iter)) { header = TNY_HEADER (tny_iterator_get_current (iter)); - found = modest_window_mgr_find_registered_header (mgr,header, NULL); + if (header) { + found = modest_window_mgr_find_registered_header (mgr,header, NULL); - g_object_unref (header); + g_object_unref (header); + } + tny_iterator_next (iter); if (found) @@ -1665,17 +1700,30 @@ _already_opened_msg (ModestWindow *win, static gboolean _selected_msg_marked_as (ModestWindow *win, TnyHeaderFlags mask, - gboolean opposite) + gboolean opposite, + gboolean all) { + ModestWindow *main_window = NULL; GtkWidget *header_view = NULL; TnyList *selected_headers = NULL; TnyIterator *iter = NULL; TnyHeader *header = NULL; - TnyHeaderFlags flags; - gboolean result = FALSE; + TnyHeaderFlags flags = 0; + gboolean result = TRUE; + + if (MODEST_IS_MAIN_WINDOW (win)) + main_window = win; + else + main_window = + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + + /* TODO: Javi, what about if the main window does not + exist?. Adding some code to avoid CRITICALs */ + if (!main_window) + return FALSE; /* Get header view to check selected messages */ - header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win), + header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(main_window), MODEST_WIDGET_TYPE_HEADER_VIEW); /* Check no selection */ @@ -1689,19 +1737,24 @@ _selected_msg_marked_as (ModestWindow *win, /* Call the function for each header */ iter = tny_list_create_iterator (selected_headers); - while (!tny_iterator_is_done (iter) && !result) { + while (!tny_iterator_is_done (iter) && result) { header = TNY_HEADER (tny_iterator_get_current (iter)); + if (header) { + flags = tny_header_get_flags (header); + if (opposite) + result = (flags & mask) == 0; + else + result = (flags & mask) != 0; - flags = tny_header_get_flags (header); - if (opposite) - result = (flags & mask) == 0; - else - result = (flags & mask) != 0; + g_object_unref (header); + } - g_object_unref (header); tny_iterator_next (iter); } + if (all) + result = result && tny_iterator_is_done (iter); + /* free */ if (selected_headers != NULL) g_object_unref (selected_headers); @@ -1730,7 +1783,7 @@ _msg_download_completed (ModestMainWindow *win) TnyList *selected_headers = NULL; TnyIterator *iter = NULL; TnyHeader *header = NULL; - TnyHeaderFlags flags; + TnyHeaderFlags flags = 0; gboolean result = FALSE; g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (win), FALSE); @@ -1754,14 +1807,16 @@ _msg_download_completed (ModestMainWindow *win) iter = tny_list_create_iterator (selected_headers); while (!tny_iterator_is_done (iter) && result) { header = TNY_HEADER (tny_iterator_get_current (iter)); - - flags = tny_header_get_flags (header); - /* TODO: is this the right flag?, it seems that some - headers that have been previously downloaded do not - come with it */ - result = (flags & TNY_HEADER_FLAG_CACHED); + if (header) { + flags = tny_header_get_flags (header); + /* TODO: is this the right flag?, it seems that some + headers that have been previously downloaded do not + come with it */ + result = (flags & TNY_HEADER_FLAG_CACHED); + + g_object_unref (header); + } - g_object_unref (header); tny_iterator_next (iter); } @@ -1770,32 +1825,27 @@ _msg_download_completed (ModestMainWindow *win) return result; } +static void +fill_list_of_caches (gpointer key, gpointer value, gpointer userdata) +{ + GSList **send_queues = (GSList **) userdata; + *send_queues = g_slist_prepend (*send_queues, value); +} + static gboolean _selected_msg_sent_in_progress (ModestWindow *win) { + ModestCacheMgr *cache_mgr; + GHashTable *send_queue_cache; + GSList *send_queues = NULL, *node; ModestTnySendQueue *send_queue = NULL; GtkWidget *header_view = NULL; - ModestTnyAccountStore *acc_store = NULL; - TnyAccount *account = NULL; TnyList *header_list = NULL; TnyIterator *iter = NULL; TnyHeader *header = NULL; - const gchar *account_name = NULL; gboolean result = FALSE; - gchar *id = NULL; + gchar *msg_uid = NULL; - /* Get transport account */ - acc_store = modest_runtime_get_account_store(); - account_name = modest_window_get_active_account (win); - - /* If no account defined, this action must be always dimmed */ - if (account_name == NULL) return FALSE; - account = modest_tny_account_store_get_transport_account_for_open_connection (acc_store, account_name); - if (!TNY_IS_TRANSPORT_ACCOUNT (account)) return FALSE; - - /* Get send queue for current ransport account */ - send_queue = modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT(account)); - g_return_val_if_fail (MODEST_IS_TNY_SEND_QUEUE (send_queue), FALSE); if (MODEST_IS_MAIN_WINDOW(win)) { @@ -1814,27 +1864,43 @@ _selected_msg_sent_in_progress (ModestWindow *win) if (!header_list) return FALSE; iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); - - /* Get message id */ - id = g_strdup(tny_header_get_message_id (header)); + if (header) { + /* Get message uid */ + msg_uid = modest_tny_send_queue_get_msg_id (header); + g_object_unref (header); + } } else if (MODEST_IS_MSG_VIEW_WINDOW(win)) { /* Get message header */ header = modest_msg_view_window_get_header (MODEST_MSG_VIEW_WINDOW(win)); + if (header) { + /* Get message uid */ + msg_uid = modest_tny_send_queue_get_msg_id (header); + g_object_unref (header); + } + } + + /* Search on send queues cache */ + cache_mgr = modest_runtime_get_cache_mgr (); + send_queue_cache = modest_cache_mgr_get_cache (cache_mgr, + MODEST_CACHE_MGR_CACHE_TYPE_SEND_QUEUE); + + g_hash_table_foreach (send_queue_cache, (GHFunc) fill_list_of_caches, &send_queues); + + for (node = send_queues; node != NULL && !result; node = g_slist_next (node)) { + send_queue = MODEST_TNY_SEND_QUEUE (node->data); - /* Get message id */ - id = g_strdup(tny_header_get_message_id (header)); + /* Check if msg uid is being processed inside send queue */ + result = modest_tny_send_queue_msg_is_being_sent (send_queue, msg_uid); } - /* Check if msg id is being processed inside send queue */ - result = modest_tny_send_queue_msg_is_being_sent (send_queue, id); /* Free */ - g_free(id); - g_object_unref (header); + g_free(msg_uid); g_object_unref(header_list); g_object_unref(iter); + g_slist_free (send_queues); return result; } @@ -1867,10 +1933,10 @@ _invalid_folder_for_purge (ModestWindow *win, /* Get folder and account of message */ msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win)); g_return_val_if_fail(msg != NULL, TRUE); - folder = tny_msg_get_folder (msg); + folder = tny_msg_get_folder (msg); if (folder == NULL) { modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments")); - goto frees; + goto frees; } g_object_unref (msg); } else if (MODEST_IS_MAIN_WINDOW (win)) { @@ -1880,9 +1946,7 @@ _invalid_folder_for_purge (ModestWindow *win, return FALSE; folder = TNY_FOLDER (modest_folder_view_get_selected (MODEST_FOLDER_VIEW (folder_view))); if (folder == NULL || ! TNY_IS_FOLDER (folder)) - return FALSE; - g_object_ref (folder); - + goto frees; } else { g_return_val_if_reached (FALSE); } @@ -1908,12 +1972,17 @@ _invalid_folder_for_purge (ModestWindow *win, /* If it's POP then dim */ if (modest_protocol_info_get_transport_store_protocol (proto_str) == MODEST_PROTOCOL_STORE_POP) { - GList *attachments; - gint n_selected; + GList *attachments = NULL; + gint n_selected = 0; result = TRUE; - attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); - n_selected = g_list_length (attachments); - g_list_free (attachments); + + /* TODO: This check is here to prevent a gwarning, but this looks like a logic error. + * murrayc */ + if (MODEST_IS_MSG_VIEW_WINDOW (win)) { + attachments = modest_msg_view_window_get_attachments (MODEST_MSG_VIEW_WINDOW(win)); + n_selected = g_list_length (attachments); + g_list_free (attachments); + } modest_dimming_rule_set_notification (rule, ngettext ("mail_ib_unable_to_pure_attach_pop_mail_singular",