* Fixes: NB#61846

pmo-trunk-r2454

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 37a7360..a20ce98 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -659,6 +659,9 @@ open_msg_cb (ModestMailOperation *mail_op,
                gtk_widget_show_all (GTK_WIDGET(win));
        }
 
+       /* Update toolbar dimming state */
+       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (win));
+
 cleanup:
        /* Free */
        g_free(account);

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 71fc34d..06b959b 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -369,9 +369,10 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        dimmed = _already_opened_msg (win, &n_messages);
                        if (dimmed) {
                                gchar *num = g_strdup_printf ("%d", n_messages);
-                               gchar *message = g_strdup_printf(_("mcen_nc_unable_to_delete_n_messages"), n_messages);
+                               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(message);
                                g_free(num);
                        }
                }
@@ -390,9 +391,12 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                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"), "1");
+/*                             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);
                        }
                }
        }