* Removed invalid duplicated code

[modest] / src / modest-ui-dimming-rules.c

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 71d32f8..94a393c 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -70,7 +70,6 @@ static gboolean _selected_folder_is_same_as_source (ModestWindow *win);
 static gboolean _msg_download_in_progress (ModestWindow *win);
 static gboolean _msg_download_completed (ModestMainWindow *win);
 static gboolean _selected_msg_sent_in_progress (ModestWindow *win);
-static gboolean _sending_in_progress (ModestWindow *win);
 static gboolean _invalid_folder_for_purge (ModestWindow *win, ModestDimmingRule *rule);
 static gboolean _transfer_mode_enabled (ModestWindow *win);
 static gboolean _selected_folder_has_subfolder_with_same_name (ModestWindow *win);
@@ -534,15 +533,11 @@ modest_ui_dimming_rules_on_sort (ModestWindow *win, gpointer user_data)
        rule = MODEST_DIMMING_RULE (user_data);
                
        /* Check dimmed rule */ 
-       if (!dimmed) {
+       if (!dimmed)
                dimmed = _selected_folder_is_root (MODEST_MAIN_WINDOW(win));
-               modest_dimming_rule_set_notification (rule, _CS("ckdg_ib_nothing_to_sort"));
-       }
 
-       if (!dimmed) {
+       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;
        
@@ -711,6 +706,33 @@ modest_ui_dimming_rules_always_dimmed (ModestWindow *win, gpointer user_data)
        return dimmed;
 }
 
+static gboolean
+_message_already_sent (ModestMsgViewWindow *view_window)
+{
+       TnyHeader *header;
+       TnyFolder *folder;
+       gboolean already_sent = FALSE;
+
+       header = modest_msg_view_window_get_header (view_window);
+       if (header) {
+               folder = tny_header_get_folder (header);
+               if (folder) {
+                       if (modest_tny_folder_guess_folder_type (folder) ==
+                           TNY_FOLDER_TYPE_OUTBOX) {                           
+                               ModestTnySendQueueStatus status = 
+                                       modest_tny_all_send_queues_get_msg_status (header);
+                               if (status == MODEST_TNY_SEND_QUEUE_UNKNOWN ||
+                                   status == MODEST_TNY_SEND_QUEUE_SENDING)
+                                       already_sent = TRUE;
+                       }
+                       g_object_unref (folder);
+               }
+               g_object_unref (header);
+       }
+       return already_sent;
+}
+
+
 gboolean 
 modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
 {
@@ -777,6 +799,11 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        if (dimmed)
                                modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
                }
+
+               /* This could happen if we're viewing a message of the
+                  outbox that has been already sent */
+               if (!dimmed)
+                       dimmed = _message_already_sent (MODEST_MSG_VIEW_WINDOW(win));
                
                /* The delete button should be dimmed when viewing an attachment,
                 * but should be enabled when viewing a message from the list, 
@@ -846,8 +873,9 @@ modest_ui_dimming_rules_on_details (ModestWindow *win, gpointer user_data)
                                                modest_dimming_rule_set_notification (rule, "");
                                }
 
+                       } else {
+                               return TRUE;
                        }
-
                }
 
        /* msg view window dimming rules */
@@ -1041,6 +1069,12 @@ modest_ui_dimming_rules_on_view_window_move_to (ModestWindow *win, gpointer user
                if (dimmed)
                        modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_item"));
        }
+
+       /* This could happen if we're viewing a message of the outbox
+          that has been already sent */
+       if (!dimmed)
+               dimmed = _message_already_sent (MODEST_MSG_VIEW_WINDOW(win));
+
        if (!dimmed) {
                if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
                        /* The move_to button should be dimmed when viewing an attachment,
@@ -1739,37 +1773,7 @@ modest_ui_dimming_rules_on_cancel_sending (ModestWindow *win, gpointer user_data
                        modest_dimming_rule_set_notification (rule, "");
        }
        if (!dimmed) {
-               dimmed = !_sending_in_progress (win);
-               if (dimmed)
-                       modest_dimming_rule_set_notification (rule, "");
-       }
-
-       return dimmed;
-}
-
-gboolean 
-modest_ui_dimming_rules_on_csm_cancel_sending (ModestWindow *win, gpointer user_data)
-{
-       ModestDimmingRule *rule = NULL;
-       TnyFolderType types[1];
-       const DimmedState *state = NULL;
-       gboolean dimmed = FALSE;
-
-       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE);
-       g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
-       rule = MODEST_DIMMING_RULE (user_data);
-       state = modest_window_get_dimming_state (win);
-
-       types[0] = TNY_FOLDER_TYPE_OUTBOX; 
-
-       /* Check dimmed rules */        
-       if (!dimmed) {
-               dimmed = !_selected_folder_is_any_of_type (win, types, 1);
-               if (dimmed) 
-                       modest_dimming_rule_set_notification (rule, "");
-       }
-       if (!dimmed) {
-               dimmed = !_sending_in_progress (win);
+               dimmed = !state->sent_in_progress;
                if (dimmed)
                        modest_dimming_rule_set_notification (rule, "");
        }
@@ -1852,6 +1856,8 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat
                                int len = -1;
                                sel = gtk_html_get_selection_html (GTK_HTML (focused), &len);
                                do_check = !((sel == NULL) || (sel[0] == '\0'));
+                       } else if (MODEST_IS_ATTACHMENTS_VIEW (focused)) {
+                               do_check = FALSE;
                        }
                        if (do_check) {
                                clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
@@ -2608,34 +2614,6 @@ _selected_msg_sent_in_progress (ModestWindow *win)
 
 
 static gboolean
-_sending_in_progress (ModestWindow *win)
-{
-       GHashTable *send_queue_cache = NULL;
-       ModestCacheMgr *cache_mgr = NULL;
-       ModestTnySendQueue *send_queue = NULL;
-       GSList *send_queues = NULL, *node = NULL;
-       gboolean result = FALSE;
-       
-       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (win), FALSE);
-       
-       /* Get send queue */
-       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);
-               
-               /* Check if send operation is in progress */
-               result = modest_tny_send_queue_sending_in_progress (send_queue);
-       }
-       
-       return result;
-}
-
-static gboolean
 _invalid_folder_for_purge (ModestWindow *win, 
                           ModestDimmingRule *rule)
 {