From c1516caebe8c4bebeb60d84d77f2cc678d84486e Mon Sep 17 00:00:00 2001 From: Javier Fernandez Garcia-Boente Date: Sun, 1 Jul 2007 17:54:47 +0000 Subject: [PATCH] * Fixed some compilation errors. pmo-trunk-r2517 --- src/modest-mail-operation.c | 2 +- src/modest-ui-actions.c | 17 +++++++++++++---- src/modest-ui-dimming-rules.c | 8 +++++++- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c index b53f775..f2eb6c0 100644 --- a/src/modest-mail-operation.c +++ b/src/modest-mail-operation.c @@ -2055,7 +2055,7 @@ modest_mail_operation_xfer_msgs (ModestMailOperation *self, priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED; g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR, MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES, - _("FIXME: folder does not accept msgs")); + _("ckct_ib_unable_to_paste_here")); /* Notify the queue */ modest_mail_operation_notify_end (self, FALSE); return; diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c index 2f77603..385913f 100644 --- a/src/modest-ui-actions.c +++ b/src/modest-ui-actions.c @@ -2909,10 +2909,19 @@ modest_ui_actions_move_folder_error_handler (ModestMailOperation *mail_op, gpointer user_data) { GObject *win = modest_mail_operation_get_source (mail_op); - - /* TODO: show error message */ - modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, - _("mail_in_ui_folder_move_target_error")); + const GError *error = NULL; + const gchar *message = NULL; + + /* Get error message */ + error = modest_mail_operation_get_error (mail_op); + if (error != NULL && error->message != NULL) { + message = error->message; + } else { + message = _("mail_in_ui_folder_move_target_error"); + } + + /* Show notification dialog */ + modest_platform_run_information_dialog ((win) ? GTK_WINDOW (win) : NULL, message); g_object_unref (win); } diff --git a/src/modest-ui-dimming-rules.c b/src/modest-ui-dimming-rules.c index 94c7919..eb8d71d 100644 --- a/src/modest-ui-dimming-rules.c +++ b/src/modest-ui-dimming-rules.c @@ -687,7 +687,7 @@ modest_ui_dimming_rules_on_paste_msgs (ModestWindow *win, gpointer user_data) ModestDimmingRule *rule = NULL; TnyFolderType types[3]; 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); @@ -708,6 +708,12 @@ modest_ui_dimming_rules_on_paste_msgs (ModestWindow *win, gpointer user_data) modest_dimming_rule_set_notification (rule, _("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")); + } + } + if (!dimmed) { dimmed = _selected_folder_is_same_as_source (win); if (dimmed) modest_dimming_rule_set_notification (rule, _("mcen_ib_unable_to_copy_samefolder")); -- 1.7.9.5