X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=57b50faad9f64d3a1ccfe3a1cd5d335c913783e7;hp=879540dc17b0e0877013e9c1523f27af0abf5ba7;hb=f48cc5efc812ab9c62b2cff21625c93cd4b0b6f8;hpb=2440bcf084dc3e89f1f08c8a537373d4a3cbface diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 879540d..57b50fa 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -315,8 +315,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) mgr = modest_runtime_get_window_mgr (); while (!tny_iterator_is_done (iter) && !found) { header = TNY_HEADER (tny_iterator_get_current (iter)); - found = modest_window_mgr_find_registered_header (mgr, header, NULL); - g_object_unref (header); + if (header) { + found = modest_window_mgr_find_registered_header (mgr, header, NULL); + g_object_unref (header); + } + tny_iterator_next (iter); } g_object_unref (iter); @@ -340,8 +343,11 @@ modest_ui_actions_on_delete_message (GtkAction *action, ModestWindow *win) if (tny_list_get_length(header_list) == 1) { iter = tny_list_create_iterator (header_list); header = TNY_HEADER (tny_iterator_get_current (iter)); - desc = g_strdup_printf ("%s", tny_header_get_subject (header)); - g_object_unref (header); + if (header) { + desc = g_strdup_printf ("%s", tny_header_get_subject (header)); + g_object_unref (header); + } + g_object_unref (iter); } message = g_strdup_printf(ngettext("emev_nc_delete_message", "emev_nc_delete_messages", @@ -736,11 +742,12 @@ open_msg_cb (ModestMailOperation *mail_op, /* Gets folder type (OUTBOX headers will be opened in edit window */ if (modest_tny_folder_is_local_folder (folder)) - folder_type = modest_tny_folder_get_local_folder_type (folder); + folder_type = modest_tny_folder_get_local_or_mmc_folder_type (folder); /* If the header is in the drafts folder then open the editor, else the message view window */ - if (folder_type == TNY_FOLDER_TYPE_DRAFTS) { + if ((folder_type == TNY_FOLDER_TYPE_DRAFTS) || + (folder_type == TNY_FOLDER_TYPE_OUTBOX)) { /* we cannot edit without a valid account... */ if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { run_account_setup_wizard(parent_win); @@ -838,11 +845,9 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) { ModestWindowMgr *mgr = NULL; TnyIterator *iter = NULL; - ModestMailOperation *mail_op1 = NULL; - ModestMailOperation *mail_op2 = NULL; + ModestMailOperation *mail_op = NULL; TnyList *not_opened_headers = NULL; - TnyList *not_opened_cached_headers = NULL; - TnyHeaderFlags flags; + TnyHeaderFlags flags = 0; /* Look if we already have a message view for each header. If true, then remove the header from the list of headers to @@ -850,15 +855,16 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) mgr = modest_runtime_get_window_mgr (); iter = tny_list_create_iterator (headers); not_opened_headers = tny_simple_list_new (); - not_opened_cached_headers = tny_simple_list_new (); + while (!tny_iterator_is_done (iter)) { - ModestWindow *window; - TnyHeader *header; - gboolean found; + ModestWindow *window = NULL; + TnyHeader *header = NULL; + gboolean found = FALSE; header = TNY_HEADER (tny_iterator_get_current (iter)); - flags = tny_header_get_flags (header); + if (header) + flags = tny_header_get_flags (header); window = NULL; found = modest_window_mgr_find_registered_header (mgr, header, &window); @@ -871,16 +877,14 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) else /* the header has been registered already, we don't do * anything but wait for the window to come up*/ - g_warning ("debug: header %p already registered, waiting for window", - header); + g_debug ("header %p already registered, waiting for window", header); } else { - if (!(flags & TNY_HEADER_FLAG_CACHED)) - tny_list_append (not_opened_headers, G_OBJECT (header)); - /* Check if msg has already been retreived */ - else - tny_list_append (not_opened_cached_headers, G_OBJECT (header)); + tny_list_append (not_opened_headers, G_OBJECT (header)); } - g_object_unref (header); + + if (header) + g_object_unref (header); + tny_iterator_next (iter); } g_object_unref (iter); @@ -890,13 +894,12 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) * make a connection. It's generally easier to do this here (in the mainloop) * than later in a thread: */ - if (tny_list_get_length (not_opened_cached_headers) > 0) { + if (tny_list_get_length (not_opened_headers) > 0) { gboolean connected = modest_platform_connect_and_wait (GTK_WINDOW (win), NULL); /* Don't go further if a connection would be necessary but none is available: */ if (!connected) { g_object_unref (not_opened_headers); - g_object_unref (not_opened_cached_headers); return; } } @@ -905,35 +908,25 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) TnyIterator *iter_not_opened = tny_list_create_iterator (not_opened_headers); while (!tny_iterator_is_done (iter_not_opened)) { TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_not_opened)); - modest_window_mgr_register_header (mgr, header); - g_object_unref (header); + if (header) { + modest_window_mgr_register_header (mgr, header); + g_object_unref (header); + } tny_iterator_next (iter_not_opened); } g_object_unref (iter_not_opened); iter_not_opened = NULL; - TnyIterator *iter_cached = tny_list_create_iterator (not_opened_cached_headers); - while (!tny_iterator_is_done (iter_cached)) { - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter_cached)); - modest_window_mgr_register_header (mgr, header); - g_object_unref (header); - - tny_iterator_next (iter_cached); - } - g_object_unref (iter_cached); - iter_cached = NULL; - - - /* Open each uncached message */ + /* Open each message */ if (tny_list_get_length (not_opened_headers) > 0) { - mail_op1 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, + mail_op = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, G_OBJECT (win), modest_ui_actions_get_msgs_full_error_handler, NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op1); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); if (tny_list_get_length (not_opened_headers) > 1) { - modest_mail_operation_get_msgs_full (mail_op1, + modest_mail_operation_get_msgs_full (mail_op, not_opened_headers, open_msg_cb, NULL, @@ -941,45 +934,16 @@ _modest_ui_actions_open (TnyList *headers, ModestWindow *win) } else { TnyIterator *iter = tny_list_create_iterator (not_opened_headers); TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - modest_mail_operation_get_msg (mail_op1, header, open_msg_cb, NULL); - g_object_unref (header); - g_object_unref (iter); - } - } - - /* Open each cached message */ - if (tny_list_get_length (not_opened_cached_headers) > 0) { - mail_op2 = modest_mail_operation_new_with_error_handling (MODEST_MAIL_OPERATION_TYPE_RECEIVE, - G_OBJECT (win), - modest_ui_actions_get_msgs_full_error_handler, - NULL); - modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op2); - if (tny_list_get_length (not_opened_cached_headers) > 1) { - modest_mail_operation_get_msgs_full (mail_op2, - not_opened_headers, - open_msg_cb, - NULL, - NULL); - } else { - TnyIterator *iter = tny_list_create_iterator (not_opened_cached_headers); - TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - modest_mail_operation_get_msg (mail_op2, header, open_msg_cb, NULL); + modest_mail_operation_get_msg (mail_op, header, open_msg_cb, NULL); g_object_unref (header); g_object_unref (iter); } + g_object_unref (mail_op); } /* Clean */ if (not_opened_headers != NULL) g_object_unref (not_opened_headers); - if (not_opened_cached_headers != NULL) - g_object_unref (not_opened_cached_headers); - if (iter != NULL) - g_object_unref (iter); - if (mail_op1 != NULL) - g_object_unref (mail_op1); - if (mail_op2 != NULL) - g_object_unref (mail_op2); } void @@ -1132,13 +1096,16 @@ download_uncached_messages (TnyList *header_list, GtkWindow *win, TnyHeaderFlags flags; 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 */ - if (! (flags & TNY_HEADER_FLAG_CACHED)) - uncached_messages ++; - g_object_unref (header); + 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 */ + if (! (flags & TNY_HEADER_FLAG_CACHED)) + uncached_messages ++; + g_object_unref (header); + } + tny_iterator_next (iter); } g_object_unref (iter); @@ -1252,17 +1219,21 @@ reply_forward (ReplyForwardAction action, ModestWindow *win) header = TNY_HEADER (tny_iterator_get_current (iter)); g_object_unref (iter); - modest_mail_operation_get_msg (mail_op, + if (header) { + modest_mail_operation_get_msg (mail_op, header, reply_forward_cb, rf_helper); -/* modest_mail_operation_get_msgs_full (mail_op, */ +/* modest_mail_operation_get_msgs_full (mail_op, */ /* header_list, */ /* reply_forward_cb, */ /* rf_helper, */ /* free_reply_forward_helper); */ + g_object_unref (header); + } + /* Clean */ g_object_unref(mail_op); } @@ -1513,22 +1484,11 @@ modest_ui_actions_do_send_receive_all (ModestWindow *win) account_names = NULL; } -/* - * Handler of the click on Send&Receive button in the main toolbar - */ -void -modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) +void +modest_do_refresh_current_folder(ModestWindow *win) { - /* Check if accounts exist */ - gboolean accounts_exist = - modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); - - /* If not, allow the user to create an account before trying to send/receive. */ - if (!accounts_exist) - modest_ui_actions_on_accounts (NULL, win); - /* Refresh currently selected folder. Note that if we only - want to retrive the headers, then the refresh only will + want to retreive the headers, then the refresh only will invoke a poke_status over all folders, i.e., only the total/unread count will be updated */ if (MODEST_IS_MAIN_WINDOW (win)) { @@ -1560,6 +1520,24 @@ modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) if (folder_store) g_object_unref (folder_store); } +} + + +/* + * Handler of the click on Send&Receive button in the main toolbar + */ +void +modest_ui_actions_on_send_receive (GtkAction *action, ModestWindow *win) +{ + /* Check if accounts exist */ + gboolean accounts_exist = + modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE); + + /* If not, allow the user to create an account before trying to send/receive. */ + if (!accounts_exist) + modest_ui_actions_on_accounts (NULL, win); + + modest_do_refresh_current_folder (win); /* Refresh the active account */ modest_ui_actions_do_send_receive (NULL, win); @@ -1935,7 +1913,7 @@ modest_ui_actions_on_send (GtkWidget *widget, ModestMsgEditWindow *edit_window) { g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW(edit_window)); - if (!modest_msg_edit_window_check_names (edit_window)) + if (!modest_msg_edit_window_check_names (edit_window, TRUE)) return; /* Offer the connection dialog, if necessary: */ @@ -2166,7 +2144,7 @@ modest_ui_actions_on_attach_file (GtkAction *action, g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); g_return_if_fail (GTK_IS_ACTION (action)); - modest_msg_edit_window_attach_file (window); + modest_msg_edit_window_offer_attach_file (window); } void @@ -2692,15 +2670,20 @@ modest_ui_actions_on_copy (GtkAction *action, TnyList *header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW (focused_widget)); TnyIterator *iter = tny_list_create_iterator (header_list); TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter)); - TnyFolder *folder = tny_header_get_folder (header); - TnyAccount *account = tny_folder_get_account (folder); - const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); - /* If it's POP then ask */ - gboolean ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == - MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE; - g_object_unref (account); - g_object_unref (folder); - g_object_unref (header); + + gboolean ask = FALSE; + if (header) { + TnyFolder *folder = tny_header_get_folder (header); + TnyAccount *account = tny_folder_get_account (folder); + const gchar *proto_str = tny_account_get_proto (TNY_ACCOUNT (account)); + /* If it's POP then ask */ + ask = (modest_protocol_info_get_transport_store_protocol (proto_str) == + MODEST_PROTOCOL_STORE_POP) ? TRUE : FALSE; + g_object_unref (account); + g_object_unref (folder); + g_object_unref (header); + } + g_object_unref (iter); /* Check that the messages have been previously downloaded */ @@ -3055,8 +3038,10 @@ modest_ui_actions_on_details (GtkAction *action, iter = tny_list_create_iterator (headers_list); header = TNY_HEADER (tny_iterator_get_current (iter)); - headers_action_show_details (header, win, NULL); - g_object_unref (header); + if (header) { + headers_action_show_details (header, win, NULL); + g_object_unref (header); + } g_object_unref (iter); g_object_unref (headers_list); @@ -3178,7 +3163,7 @@ void modest_ui_actions_on_check_names (GtkAction *action, ModestMsgEditWindow *window) { g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (window)); - modest_msg_edit_window_check_names (window); + modest_msg_edit_window_check_names (window, FALSE); } static void @@ -3257,12 +3242,16 @@ has_retrieved_msgs (TnyList *list) iter = tny_list_create_iterator (list); while (tny_iterator_is_done (iter) && !found) { TnyHeader *header; - TnyHeaderFlags flags; + TnyHeaderFlags flags = 0; header = TNY_HEADER (tny_iterator_get_current (iter)); - flags = tny_header_get_flags (header); - if (!(flags & TNY_HEADER_FLAG_PARTIAL)) - found = TRUE; + if (header) { + flags = tny_header_get_flags (header); + if (!(flags & TNY_HEADER_FLAG_PARTIAL)) + found = TRUE; + + g_object_unref (header); + } if (!found) tny_iterator_next (iter); @@ -3287,15 +3276,18 @@ msgs_move_to_confirmation (GtkWindow *win, /* If the destination is a local folder */ if (modest_tny_folder_is_local_folder (dest_folder)) { - TnyFolder *src_folder; - TnyIterator *iter; - TnyHeader *header; + TnyFolder *src_folder = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; /* Get source folder */ iter = tny_list_create_iterator (headers); header = TNY_HEADER (tny_iterator_get_current (iter)); - src_folder = tny_header_get_folder (header); - g_object_unref (header); + if (header) { + src_folder = tny_header_get_folder (header); + g_object_unref (header); + } + g_object_unref (iter); /* if no src_folder, message may be an attahcment */ @@ -3316,8 +3308,10 @@ msgs_move_to_confirmation (GtkWindow *win, response = modest_platform_run_confirmation_dialog (GTK_WINDOW (win), (const gchar *) message); } + g_object_unref (src_folder); } + return response; } @@ -3410,12 +3404,16 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, while (!tny_iterator_is_done (iter)) { TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) { + if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) { if (tny_mime_part_is_purged (part)) some_purged = TRUE; else pending_purges++; } + + if (part) + g_object_unref (part); + tny_iterator_next (iter); } @@ -3430,8 +3428,12 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); - if (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part)) + if (part && (tny_mime_part_is_attachment (part) || TNY_IS_MSG (part))) tny_mime_part_set_purged (part); + + if (part) + g_object_unref (part); + tny_iterator_next (iter); } @@ -3447,7 +3449,14 @@ open_msg_for_purge_cb (ModestMailOperation *mail_op, TnyMimePart *part; part = TNY_MIME_PART (tny_iterator_get_current (iter)); - g_object_unref (part); + if (part) { + /* One for the reference given by tny_iterator_get_current(): */ + g_object_unref (part); + + /* TODO: Is this meant to remove the attachment by doing another unref()? + * Otherwise, this seems useless. */ + } + tny_iterator_next (iter); } modest_window_mgr_unregister_header (mgr, header); @@ -3719,10 +3728,10 @@ do_headers_action (ModestWindow *win, HeadersFunc func, gpointer user_data) { - TnyList *headers_list; - TnyIterator *iter; - TnyHeader *header; - TnyFolder *folder; + TnyList *headers_list = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; + TnyFolder *folder = NULL; /* Get headers */ headers_list = get_selected_headers (win); @@ -3732,8 +3741,10 @@ do_headers_action (ModestWindow *win, /* Get the folder */ iter = tny_list_create_iterator (headers_list); header = TNY_HEADER (tny_iterator_get_current (iter)); - folder = tny_header_get_folder (header); - g_object_unref (header); + if (header) { + folder = tny_header_get_folder (header); + g_object_unref (header); + } /* Call the function for each header */ while (!tny_iterator_is_done (iter)) {