* modest-folder-view.c: change sorting for remote folders: make Inbox be the first...

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index c050f68..fed9240 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -454,7 +454,7 @@ modest_ui_dimming_rules_on_delete_msg (ModestWindow *win, gpointer user_data)
                if (!dimmed) {
                        dimmed = _selected_msg_sent_in_progress (win);
                        if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("mcen_ib_message_unableto_delete"));
+                               modest_dimming_rule_set_notification (rule, _("ckct_ib_unable_to_delete]"));
                }
        } 
        else if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
@@ -717,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) {
@@ -888,11 +888,6 @@ modest_ui_dimming_rules_on_cut (ModestWindow *win, gpointer user_data)
 
        /* Check window specific dimming rules */
        if (MODEST_IS_MAIN_WINDOW (win)) {
-               if (!dimmed) {
-                       dimmed = _selected_folder_not_writeable (MODEST_MAIN_WINDOW(win));
-                       if (dimmed)
-                               modest_dimming_rule_set_notification (rule, _("mcen_ib_message_unableto_delete"));
-               }
                if (!dimmed) { 
                        dimmed = _selected_folder_is_empty (MODEST_MAIN_WINDOW(win));                   
                        if (dimmed)
@@ -958,8 +953,8 @@ modest_ui_dimming_rules_on_view_previous (ModestWindow *win, gpointer user_data)
        }
        if (!dimmed) {
                dimmed = modest_msg_view_window_first_message_selected (MODEST_MSG_VIEW_WINDOW(win));
-               if (dimmed)
-                       modest_dimming_rule_set_notification (rule, "");
+/*             if (dimmed) */
+/*                     modest_dimming_rule_set_notification (rule, ""); */
        }               
 
        return dimmed;
@@ -983,8 +978,8 @@ modest_ui_dimming_rules_on_view_next (ModestWindow *win, gpointer user_data)
        }
        if (!dimmed) {
                dimmed = modest_msg_view_window_last_message_selected (MODEST_MSG_VIEW_WINDOW(win));
-               if (dimmed)
-                       modest_dimming_rule_set_notification (rule, "");
+/*             if (dimmed) */
+/*                     modest_dimming_rule_set_notification (rule, ""); */
        }               
 
        return dimmed;
@@ -1070,7 +1065,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;
@@ -1304,7 +1299,7 @@ _selected_folder_is_any_of_type (ModestWindow *win,
                                                                   MODEST_WIDGET_TYPE_FOLDER_VIEW);
                /* If no folder view, always dimmed */
                if (!folder_view)
-                       return TRUE;
+                       return FALSE;
        
                /* Get selected folder as parent of new folder to create */
                folder = modest_folder_view_get_selected (MODEST_FOLDER_VIEW(folder_view));
@@ -1312,7 +1307,7 @@ _selected_folder_is_any_of_type (ModestWindow *win,
                if (!(folder && TNY_IS_FOLDER(folder))) {
                        if (folder)
                                g_object_unref (folder);
-                       return TRUE;
+                       return FALSE;
                }
                
                /* Check folder type */
@@ -1365,7 +1360,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);
@@ -1393,7 +1388,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;
@@ -1438,7 +1433,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;