* Check main window toolbar dimming rules after

open some message (delete toolbar must dimmed).

pmo-trunk-r2455

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index a20ce98..383e38e 100644 (file)
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -660,7 +660,9 @@ open_msg_cb (ModestMailOperation *mail_op,
        }
 
        /* Update toolbar dimming state */
-       modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (win));
+       if (MODEST_IS_MAIN_WINDOW (parent_win)) {
+               modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (parent_win));
+       }
 
 cleanup:
        /* Free */

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 06b959b..37fddd7 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -392,7 +392,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                        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");
+                               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);