* src/modest-ui-dimming-rules.c:

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

diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c
index 42d1384..7f109f8 100644 (file)
--- a/src/modest-ui-dimming-rules.c
+++ b/src/modest-ui-dimming-rules.c
@@ -67,7 +67,6 @@ static gboolean _msg_download_in_progress (ModestWindow *win);
 static gboolean _msg_download_completed (ModestMainWindow *win);
 static gboolean _selected_msg_sent_in_progress (ModestWindow *win);
 static gboolean _sending_in_progress (ModestWindow *win);
-static gboolean _send_receive_in_progress (ModestWindow *win);
 static gboolean _invalid_folder_for_purge (ModestWindow *win, ModestDimmingRule *rule);
 static gboolean _transfer_mode_enabled (ModestWindow *win);
 static gboolean _selected_folder_has_subfolder_with_same_name (ModestWindow *win);
@@ -360,6 +359,14 @@ modest_ui_dimming_rules_on_new_folder (ModestWindow *win, gpointer user_data)
        g_return_val_if_fail (MODEST_IS_DIMMING_RULE (user_data), FALSE);
        rule = MODEST_DIMMING_RULE (user_data);
 
+       if (!dimmed) {
+               dimmed = _transfer_mode_enabled (win);
+               if (dimmed) {
+                       modest_dimming_rule_set_notification (rule, _("mail_in_ui_folder_create_error"));
+                       return dimmed;
+               }
+       }
+
        /* Get selected folder as parent of new folder to create */
        folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(win),
                                                           MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
@@ -561,6 +568,11 @@ modest_ui_dimming_rules_on_rename_folder (ModestWindow *win, gpointer user_data)
                if (dimmed)
                        modest_dimming_rule_set_notification (rule, "");
        }
+       if (!dimmed) {
+               dimmed = _transfer_mode_enabled (win);
+               if (dimmed)
+                       modest_dimming_rule_set_notification (rule, "");
+       }
 
        return dimmed;
 }
@@ -1683,7 +1695,7 @@ modest_ui_dimming_rules_on_csm_cancel_sending (ModestWindow *win, gpointer user_
                        modest_dimming_rule_set_notification (rule, "");
        }
        if (!dimmed) {
-               dimmed = !_send_receive_in_progress (win);
+               dimmed = !_sending_in_progress (win);
                if (dimmed)
                        modest_dimming_rule_set_notification (rule, "");
        }
@@ -2160,7 +2172,9 @@ _folder_is_any_of_type (TnyFolder *folder,
 
        /* Get folder type */
        folder_type = modest_tny_folder_guess_folder_type (folder);
-               
+       if (folder_type == TNY_FOLDER_TYPE_INVALID)
+               g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+       
        /* Check foler type */
        for (i=0; i < ntypes; i++) {
                result = result || folder_type == types[i];
@@ -2459,19 +2473,6 @@ _sending_in_progress (ModestWindow *win)
 }
 
 static gboolean
-_send_receive_in_progress (ModestWindow *win)
-{
-       gboolean result = FALSE;
-       
-       g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (win), FALSE);
-
-       /* Check if send operation is in progress */
-       result = modest_main_window_send_receive_in_progress (MODEST_MAIN_WINDOW (win));
-
-       return result;
-}
-
-static gboolean
 _invalid_folder_for_purge (ModestWindow *win, 
                           ModestDimmingRule *rule)
 {
@@ -2594,9 +2595,9 @@ _selected_folder_has_subfolder_with_same_name (ModestWindow *win)
        if (folder_name == NULL) goto frees;
 
        /* Check source subfolders names */
-       result = modest_tny_folder_has_subfolder_with_name (folder, folder_name);
-       
-       
+       result = modest_tny_folder_has_subfolder_with_name (folder, folder_name,
+                                                           TRUE);
+               
        /* Free */
  frees:
        if (folder != NULL)