Added fixes for week 05 release.

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 34c4d53..3bf7ae1 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -330,10 +330,16 @@ modest_ui_dimming_rules_on_new_msg_or_folder (ModestWindow *win,
        /* Check first if the folder view has the focus */
        folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
                                                           MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-       if (gtk_widget_is_focus (folder_view)) {
-               return modest_ui_dimming_rules_on_new_folder (win, user_data);
+
+       /* Check that the widget exists */
+       if (folder_view) {
+               if (gtk_widget_is_focus (folder_view)) {
+                       return modest_ui_dimming_rules_on_new_folder (win, user_data);
+               } else {
+                       return modest_ui_dimming_rules_on_new_msg (win, user_data);
+               }
        } else {
-               return modest_ui_dimming_rules_on_new_msg (win, user_data);
+               return FALSE;
        }
 }
 
@@ -980,12 +986,12 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
                if (!dimmed) {
                        dimmed = _selected_folder_not_moveable (MODEST_MAIN_WINDOW(win));
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items"));
+                               modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                }
                if (!dimmed) {
                        dimmed = _selected_folder_is_any_of_type (win, types, 5);
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+                               modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                }
        }
        
@@ -993,7 +999,7 @@ modest_ui_dimming_rules_on_main_window_move_to (ModestWindow *win, gpointer user
        if (!dimmed) {
                dimmed = (state->already_opened_msg > 0) ? TRUE : FALSE;
                if (dimmed) {
-                       gchar *message = g_strdup_printf(_("emev_bd_unabletomove_items"), 
+                       gchar *message = g_strdup_printf(_("emev_nc_unabletomove_items"),
                                                         state->already_opened_msg);
                        modest_dimming_rule_set_notification (rule, message);
                        g_free(message);
@@ -1365,17 +1371,17 @@ modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data)
                        if (!dimmed) {
                                dimmed = _selected_folder_not_deletable (MODEST_MAIN_WINDOW(win));
                                if (dimmed)
-                                       modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_items"));
+                                       modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                        }
                        if (!dimmed) {
                                dimmed = _selected_folder_is_root_or_inbox (MODEST_MAIN_WINDOW(win));
                                if (dimmed)
-                                       modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+                                       modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                        }
                        if (!dimmed) {
                                dimmed = _selected_folder_is_any_of_type (win, types, 3);
                                if (dimmed)
-                                       modest_dimming_rule_set_notification (rule, _("emev_bd_unabletomove_itemsr"));
+                                       modest_dimming_rule_set_notification (rule, _("emev_nc_unabletomove_items"));
                        }
                }
        }
@@ -1566,7 +1572,7 @@ modest_ui_dimming_rules_on_editor_remove_attachment (ModestWindow *win, gpointer
                n_att_selected = tny_list_get_length (selected_attachments);
                g_object_unref (selected_attachments);
 
-               dimmed = (n_att_selected != 1);
+               dimmed = (n_att_selected < 1);
        }
        
        return dimmed;