* Change save_settings call of main and viewer windows to

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index cdc6e44..7ebd97d 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -174,23 +174,26 @@ modest_ui_dimming_rules_on_delete (ModestWindow *win, gpointer user_data)
        GtkWidget *header_view = NULL;  
        gboolean dimmed = FALSE;
 
-       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), FALSE);
        g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
        rule = MODEST_DIMMING_RULE (user_data);
        
-       /* Get the folder view */
-       folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
-                                                          MODEST_WIDGET_TYPE_FOLDER_VIEW);
-
-       /* Get header view */
-       header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
+       if (MODEST_IS_MAIN_WINDOW (win)) {
+               /* Get the folder view */
+               folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
+                                                                  MODEST_WIDGET_TYPE_FOLDER_VIEW);
+               
+               /* Get header view */
+               header_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
                                                           MODEST_WIDGET_TYPE_HEADER_VIEW);
 
-       if (header_view && gtk_widget_is_focus (header_view)) 
-               dimmed = modest_ui_dimming_rules_on_delete_msg (win, rule);
+               if (header_view && gtk_widget_is_focus (header_view)) 
+                       dimmed = modest_ui_dimming_rules_on_delete_msg (win, rule);
 
-       if (folder_view && gtk_widget_is_focus (folder_view)) 
+               if (folder_view && gtk_widget_is_focus (folder_view)) 
+                       dimmed = modest_ui_dimming_rules_on_delete_folder (win, rule);
+       } else {
                dimmed = modest_ui_dimming_rules_on_delete_folder (win, rule);
+       }
 
        return dimmed;
 }
@@ -714,12 +717,12 @@ modest_ui_dimming_rules_on_paste_msgs (ModestWindow *win, gpointer user_data)
        if (!dimmed) {
                dimmed = _selected_folder_is_any_of_type (win, types, 3);
                if (dimmed)
-                       modest_dimming_rule_set_notification (rule, _("ckct_ib_unable_to_paste_here"));
+                       modest_dimming_rule_set_notification (rule, dgettext("hildon-common-strings", "ckct_ib_unable_to_paste_here"));
        }
        if (!dimmed) {
                dimmed = _selected_folder_not_writeable (MODEST_MAIN_WINDOW(win));
                if (dimmed) {
-                       modest_dimming_rule_set_notification (rule, _("ckct_ib_unable_to_paste_here"));
+                       modest_dimming_rule_set_notification (rule, dgettext("hildon-common-strings", "ckct_ib_unable_to_paste_here"));
                }
        }
        if (!dimmed) {
@@ -1067,7 +1070,7 @@ modest_ui_dimming_rules_on_add_to_contacts (ModestWindow *win, gpointer user_dat
                gchar *selection = NULL;
                selection = gtk_clipboard_wait_for_text (clipboard);
 
-               dimmed = !((selection != NULL) && (modest_text_utils_validate_recipient (selection)));
+               dimmed = !((selection != NULL) && (modest_text_utils_validate_recipient (selection, NULL)));
        }
 
        return dimmed;
@@ -1362,7 +1365,7 @@ _selected_folder_is_snd_level (ModestMainWindow *win)
        GtkTreeModel *model = NULL;
        GtkTreePath *path = NULL;
        GtkTreeIter iter;
-       TnyFolderStore *folder = NULL;
+       TnyFolderStore *folder = NULL;
        gboolean result = FALSE;
 
        g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(win), TRUE);
@@ -1390,7 +1393,7 @@ _selected_folder_is_snd_level (ModestMainWindow *win)
  frees:
        if (folder != NULL)
                g_object_unref (folder);
-       if (path != NULL) 
+       if (path != NULL)
                gtk_tree_path_free (path);
        
        return result;
@@ -1435,7 +1438,7 @@ _invalid_clipboard_selected (ModestWindow *win,
                          (MODEST_IS_ATTACHMENTS_VIEW (focused)));
                
                if (result)
-                       modest_dimming_rule_set_notification (rule, _(""));                     
+                       modest_dimming_rule_set_notification (rule, "");
        }               
        else if (MODEST_IS_MAIN_WINDOW (win)) {
                GtkWidget *header_view = NULL;