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);
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, "");
}
}
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)
{
- TnyMsg *msg = NULL;
TnyFolder *folder = NULL;
TnyAccount *account = NULL;
gboolean result = FALSE;
if (MODEST_IS_MSG_VIEW_WINDOW (win)) {
/* Get folder and account of message */
- msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
+ TnyMsg *msg = modest_msg_view_window_get_message (MODEST_MSG_VIEW_WINDOW (win));
g_return_val_if_fail(msg != NULL, TRUE);
folder = tny_msg_get_folder (msg);
+ g_object_unref (msg);
if (folder == NULL) {
modest_dimming_rule_set_notification (rule, _("mail_ib_unable_to_purge_attachments"));
goto frees;
}
- g_object_unref (msg);
} else if (MODEST_IS_MAIN_WINDOW (win)) {
GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
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)