Commit a4eddf19 authored by Michael J. Chudobiak's avatar Michael J. Chudobiak Committed by Michael J. Chudobiak

Added a warning when renaming imported photos to avoid file overwrites.

2007-07-19  Michael J. Chudobiak  <mjc@cvs.gnome.org>

        * NEWS:
        * src/dlg-photo-importer.c: (get_file_name), (save_images__init),
        (save_images__done):
        Added a warning when renaming imported photos to avoid file
        overwrites. Bug #332684.


svn path=/branches/metadata-ideas/; revision=1814
parent 8c69c8c1
2007-07-19 Michael J. Chudobiak <mjc@cvs.gnome.org>
* NEWS:
* src/dlg-photo-importer.c: (get_file_name), (save_images__init),
(save_images__done):
Added a warning when renaming imported photos to avoid file
overwrites. Bug #332684.
2007-07-19 Michael J. Chudobiak <mjc@cvs.gnome.org>
* NEWS:
......
......@@ -10,6 +10,8 @@ trunk, since last 2.10.x
* Optionally use subfolders when generating web albums. Bug #119492.
* Wrap to next/previous line when navigating with arrow keys
at start/end of a row of images. Bug 449338.
* Added a warning when renaming imported photos to avoid file
overwrites. Bug #332684.
Bugfixes:
......
......@@ -130,6 +130,7 @@ struct _DialogData {
gboolean async_operation;
gboolean interrupted;
gboolean error;
gboolean renamed_files;
float target;
float fraction;
char *progress_info;
......@@ -1201,6 +1202,7 @@ get_file_name (DialogData *data,
g_free (file_path);
file_path = g_build_filename (local_folder, test_name, NULL);
g_free (test_name);
data->renamed_files = TRUE;
}
g_free (file_name);
......@@ -1444,6 +1446,8 @@ save_images__init (AsyncOperationData *aodata,
all_windows_remove_monitor ();
data->image_n = 1;
data->renamed_files = FALSE;
if (data->delete_list != NULL) {
path_list_free (data->delete_list);
data->delete_list = NULL;
......@@ -1475,6 +1479,10 @@ save_images__done (AsyncOperationData *aodata,
gboolean interrupted;
gboolean error;
if (data->renamed_files)
_gtk_info_dialog_run (GTK_WINDOW (data->dialog),
"Warning - one or more files were renamed (by adding a numeric prefix) to avoid overwriting existing files.");
g_mutex_lock (data->yes_or_no);
interrupted = data->interrupted;
error = data->error;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment