Index: plugins/backup-restore/org-gnome-backup-restore.error.xml
===================================================================
--- plugins/backup-restore/org-gnome-backup-restore.error.xml (revision 35517)
+++ plugins/backup-restore/org-gnome-backup-restore.error.xml (working copy)
@@ -17,4 +17,8 @@
+
+ <_title>Insufficient Permissions
+ <_secondary>The selected folder does not have enough permissions to create the file
+
Index: plugins/backup-restore/backup-restore.c
===================================================================
--- plugins/backup-restore/backup-restore.c (revision 35517)
+++ plugins/backup-restore/backup-restore.c (working copy)
@@ -3,6 +3,7 @@
#include
#include
#include
+#include
#include
#include "shell/es-menu.h"
#include "mail/em-config.h"
@@ -86,6 +87,16 @@ dialog_prompt_user(GtkWindow *parent, co
return mask;
}
+static gboolean
+epbr_perform_pre_backup_checks (char* dir)
+{
+#ifdef G_OS_WIN32
+ return TRUE;
+#else
+ return (g_access (dir, W_OK) == 0);
+#endif
+}
+
void
org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target)
{
@@ -110,18 +121,27 @@ org_gnome_backup_restore_backup (EPlugin
char *filename;
guint32 mask;
char *uri = NULL;
+ char *dir;
uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (dlg));
e_file_update_save_path(uri, TRUE);
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dlg));
+ dir = gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dlg));
gtk_widget_destroy (dlg);
- mask = dialog_prompt_user (GTK_WINDOW (target->target.widget), _("_Restart Evolution after backup"), "org.gnome.backup-restore:backup-confirm", NULL);
- if (mask & BR_OK)
- backup (filename, (mask & BR_START) ? TRUE: FALSE);
+
+ if (epbr_perform_pre_backup_checks (dir)) {
+
+ mask = dialog_prompt_user (GTK_WINDOW (target->target.widget), _("_Restart Evolution after backup"), "org.gnome.backup-restore:backup-confirm", NULL);
+ if (mask & BR_OK)
+ backup (filename, (mask & BR_START) ? TRUE: FALSE);
+ } else {
+ e_error_run (NULL, "org.gnome.backup-restore:insufficient-permissions", NULL);
+ }
g_free (filename);
+ g_free (dir);
return;
}