* src/modest-ui-dimming-rules.c:

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index b2fa8ac..57c0970 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -727,17 +727,9 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        dimmed = _invalid_msg_selected (MODEST_MAIN_WINDOW(win), FALSE, user_data);
                }
                if (!dimmed) {
-                       dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE;
-                       if (dimmed) {
-                               gchar *num = NULL, *message = NULL;
-
-                               num = g_strdup_printf ("%d", state->already_opened_msg);
-                               message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), num);
-                               modest_dimming_rule_set_notification (rule, message);
-                               g_free(num);
-                               g_free(message);
-                       }
-                       
+                       dimmed = state->sent_in_progress;
+                       if (dimmed)
+                               modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
                }
                if (!dimmed) {
                        dimmed = state->any_marked_as_deleted;
@@ -748,9 +740,16 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        }
                }
                if (!dimmed) {
-                       dimmed = state->sent_in_progress;
-                       if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _CS("ckct_ib_unable_to_delete"));
+                       dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE;
+                       if (dimmed) {
+                               gchar *message = NULL;
+
+                               message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), 
+                                                         state->already_opened_msg);
+                               modest_dimming_rule_set_notification (rule, message);
+                               g_free(message);
+                       }
+                       
                }
        } 
        else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
@@ -1595,8 +1594,7 @@ modest_ui_dimming_rules_on_send (ModestWindow *win, gpointer user_data)
                body_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (body_field));
                subject = gtk_entry_get_text (GTK_ENTRY (subject_field));
 
-               dimmed = ((subject == NULL || subject[0] == '\0')
-                         || (gtk_text_buffer_get_char_count(body_buffer) == 0));
+               dimmed = (subject == NULL || subject[0] == '\0');
                if (dimmed)
                        modest_dimming_rule_set_notification (rule, _("mcen_ib_subject_or_body_not_modified"));
        }
@@ -2607,7 +2605,7 @@ _invalid_account_for_purge (ModestWindow *win,
 {
        const gchar *account_name;
        ModestTnyAccountStore *account_store;
-       TnyAccount *store_account;
+       TnyAccount *store_account = NULL;
        gboolean result = FALSE;
        const gchar *protocol_name;