* Increase performance of dimming rules manager, avoiding call

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index a5109d3..13ba2d8 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -297,7 +297,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                if (!dimmed) {
                        dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win));                   
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("mcen_ib_nothing_to_del"));
+                               modest_dimming_rule_set_notification (rule, _("ckct_ib_nothing_to_delete"));
                }
                if (!dimmed) {
                        dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data);
@@ -1010,7 +1010,7 @@ _invalid_msg_selected (ModestMainWindow *win,
 {
        GtkWidget *header_view = NULL;          
        GtkWidget *folder_view = NULL;
-       TnyList *selected_headers = NULL;
+       gboolean selected_headers = FALSE;
        gboolean result = FALSE;
 
        g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE);
@@ -1025,26 +1025,21 @@ _invalid_msg_selected (ModestMainWindow *win,
                                                           MODEST_WIDGET_TYPE_FOLDER_VIEW);
 
        /* Get selected headers */
-       selected_headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
+       selected_headers = modest_header_view_has_selected_headers (MODEST_HEADER_VIEW(header_view));
 
        /* Check dimmed rule (TODO: check focus on widgets */   
        if (!result) {
-               result = (selected_headers == NULL);
-/*             result = ((selected_headers == NULL) ||  */
-/*                       (GTK_WIDGET_HAS_FOCUS (folder_view))); */
+               result = ((!selected_headers) ||
+                         (gtk_widget_is_focus (folder_view)));
                if (result)
                        modest_dimming_rule_set_notification (rule, _("mcen_ib_no_message_selected"));
        }
        if (!result && unique) {
-               result = tny_list_get_length (selected_headers) > 1;
+               result = modest_header_view_count_selected_headers (MODEST_HEADER_VIEW(header_view)) > 1;
                if (result)
                        modest_dimming_rule_set_notification (rule, _("mcen_ib_select_one_message"));
        }
 
-       /* free */
-       if (selected_headers != NULL) 
-               g_object_unref (selected_headers);
-
        return result;
 }
 
@@ -1065,6 +1060,11 @@ _already_opened_msg (ModestWindow *win)
        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
                                                           MODEST_WIDGET_TYPE_HEADER_VIEW);
 
+
+       /* Check no selection */
+       if (!modest_header_view_has_selected_headers (MODEST_HEADER_VIEW(header_view)))
+           return FALSE;
+           
        /* Get selected headers */
        selected_headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
        if (selected_headers == NULL) 
@@ -1107,6 +1107,10 @@ _selected_msg_marked_as (ModestWindow *win,
        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
                                                           MODEST_WIDGET_TYPE_HEADER_VIEW);
 
+       /* Check no selection */
+       if (!modest_header_view_has_selected_headers (MODEST_HEADER_VIEW(header_view)))
+           return TRUE;
+
        /* Get selected headers */
        selected_headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
        if (selected_headers == NULL) 
@@ -1165,6 +1169,10 @@ _msg_download_completed (ModestMainWindow *win)
        header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
                                                           MODEST_WIDGET_TYPE_HEADER_VIEW);
 
+       /* Check no selection */
+       if (!modest_header_view_has_selected_headers (MODEST_HEADER_VIEW(header_view)))
+           return TRUE;
+
        /* Get selected headers */
        selected_headers = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
        if (selected_headers == NULL) 
@@ -1224,6 +1232,10 @@ _selected_msg_sent_in_progress (ModestWindow *win)
                header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
                                                                   MODEST_WIDGET_TYPE_HEADER_VIEW);
                
+               /* Check no selection */
+               if (!modest_header_view_has_selected_headers (MODEST_HEADER_VIEW(header_view)))
+                   return FALSE;
+
                /* Get selected headers */
                header_list = modest_header_view_get_selected_headers (MODEST_HEADER_VIEW(header_view));
 
@@ -1245,7 +1257,7 @@ _selected_msg_sent_in_progress (ModestWindow *win)
        }
 
        /* Check if msg id is being processed inside send queue */
-       result = (modest_tny_send_queue_get_msg_status (send_queue, tny_header_get_message_id(header)) == MODEST_TNY_SEND_QUEUE_SENDING);
+       result = modest_tny_send_queue_msg_is_being_sent (send_queue, id);
 
        /* Free */
        g_free(id);