added done callback to utilops

used the callback for metadata writting at exit and for renaming new
folder

diff --git a/src/layout.c b/src/layout.c
index db7b504..af050ec 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -1047,7 +1047,7 @@ gint layout_set_fd(LayoutWindow *lw, FileData *fd)
                }
 
        if (options->metadata.confirm_on_dir_change)
-               metadata_write_queue_confirm();
+               metadata_write_queue_confirm(NULL, NULL);
 
        return TRUE;
 }

diff --git a/src/layout_util.c b/src/layout_util.c
index 3ccd7ee..5d61d1c 100644 (file)
--- a/src/layout_util.c
+++ b/src/layout_util.c
@@ -251,7 +251,7 @@ static void layout_menu_dir_cb(GtkAction *action, gpointer data)
 {
        LayoutWindow *lw = data;
 
-       file_util_create_dir(lw->dir_fd, layout_window(lw));
+       file_util_create_dir(lw->dir_fd, layout_window(lw), NULL, NULL);
 }
 
 static void layout_menu_copy_cb(GtkAction *action, gpointer data)
@@ -2040,7 +2040,7 @@ void layout_bars_new_image(LayoutWindow *lw)
 
        /* this should be called here to handle the metadata edited in bars */
        if (options->metadata.confirm_on_image_change)
-               metadata_write_queue_confirm();
+               metadata_write_queue_confirm(NULL, NULL);
 }
 
 void layout_bars_new_selection(LayoutWindow *lw, gint count)

diff --git a/src/main.c b/src/main.c
index 631a9e5..27f8612 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -645,11 +645,16 @@ static gint exit_confirm_dlg(void)
        return TRUE;
 }
 
+static void exit_program_write_metadata_cb(gint success, const gchar *dest_path, gpointer data)
+{
+       if (success) exit_program();
+}
+
 void exit_program(void)
 {
        layout_image_full_screen_stop(NULL);
 
-       if (metadata_write_queue_confirm()) return;
+       if (metadata_write_queue_confirm(exit_program_write_metadata_cb, NULL)) return;
 
        if (exit_confirm_dlg()) return;
 

diff --git a/src/metadata.c b/src/metadata.c
index 8e785ee..7e8964c 100644 (file)
--- a/src/metadata.c
+++ b/src/metadata.c
@@ -99,7 +99,7 @@ gboolean metadata_write_queue_remove_list(GList *list)
 }
 
 
-gboolean metadata_write_queue_confirm()
+gboolean metadata_write_queue_confirm(FileUtilDoneFunc done_func, gpointer done_data)
 {
        GList *work;
        GList *to_approve = NULL;
@@ -115,7 +115,7 @@ gboolean metadata_write_queue_confirm()
                to_approve = g_list_prepend(to_approve, file_data_ref(fd));
                }
 
-       file_util_write_metadata(NULL, to_approve, NULL);
+       file_util_write_metadata(NULL, to_approve, NULL, done_func, done_data);
        
        filelist_free(to_approve);
        
@@ -124,7 +124,7 @@ gboolean metadata_write_queue_confirm()
 
 static gboolean metadata_write_queue_idle_cb(gpointer data)
 {
-       metadata_write_queue_confirm();
+       metadata_write_queue_confirm(NULL, NULL);
        metadata_write_idle_id = -1;
        return FALSE;
 }

diff --git a/src/metadata.h b/src/metadata.h
index 2a176fb..4eb942e 100644 (file)
--- a/src/metadata.h
+++ b/src/metadata.h
@@ -17,7 +17,7 @@
 gboolean metadata_write_queue_remove(FileData *fd);
 gboolean metadata_write_queue_remove_list(GList *list);
 gboolean metadata_write_perform(FileData *fd);
-gboolean metadata_write_queue_confirm(void);
+gboolean metadata_write_queue_confirm(FileUtilDoneFunc done_func, gpointer done_data);
 
 
 

diff --git a/src/typedefs.h b/src/typedefs.h
index 660ab1c..e01e884 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -212,6 +212,8 @@ struct _ImageLoader;
 
 typedef void (* ThumbLoaderFunc)(ThumbLoader *tl, gpointer data);
 
+typedef void (* FileUtilDoneFunc)(gboolean success, const gchar *done_path, gpointer data);
+
 struct _ThumbLoader
 {
        gint standard_loader;

diff --git a/src/utilops.c b/src/utilops.c
index e237654..2d5e0fe 100644 (file)
--- a/src/utilops.c
+++ b/src/utilops.c
@@ -314,6 +314,9 @@ struct _UtilityData {
        
        gint external_command;
        gpointer resume_data;
+       
+       FileUtilDoneFunc done_func;
+       gpointer done_data;
 };
 
 enum {
@@ -1566,6 +1569,10 @@ void file_util_dialog_run(UtilityData *ud)
                                {
                                metadata_write_queue_remove_list(ud->flist);
                                }
+                       
+                       if (ud->done_func)
+                               ud->done_func((ud->phase == UTILITY_PHASE_DONE), ud->dest_path, ud->done_data);
+                               
                        if (ud->with_sidecars)
                                file_data_sc_free_ci_list(ud->flist);
                        else
@@ -1641,7 +1648,7 @@ static void file_util_delete_full(FileData *source_fd, GList *source_list, GtkWi
        file_util_dialog_run(ud);
 }
 
-static void file_util_write_metadata_full(FileData *source_fd, GList *source_list, GtkWidget *parent, UtilityPhase phase)
+static void file_util_write_metadata_full(FileData *source_fd, GList *source_list, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data)
 {
        UtilityData *ud;
        GList *flist = filelist_copy(source_list);
@@ -1669,6 +1676,9 @@ static void file_util_write_metadata_full(FileData *source_fd, GList *source_lis
        ud->content_list = NULL;
        ud->parent = parent;
        
+       ud->done_func = done_func;
+       ud->done_data = done_data;
+       
        ud->messages.title = _("Write metadata");
        ud->messages.question = _("Write metadata?");
        ud->messages.desc_flist = _("This will write the changed metadata into the following files");
@@ -2232,7 +2242,7 @@ static void file_util_rename_dir_full(FileData *fd, const gchar *new_path, GtkWi
        file_util_dialog_run(ud);
 }
 
-static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase)
+static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkWidget *parent, UtilityPhase phase, FileUtilDoneFunc done_func, gpointer done_data)
 {
        UtilityData *ud; 
 
@@ -2258,6 +2268,9 @@ static void file_util_create_dir_full(FileData *fd, const gchar *dest_path, GtkW
                }
        
        ud->dir_fd = file_data_new_simple(ud->dest_path);
+
+       ud->done_func = done_func;
+       ud->done_data = done_data;
        
        ud->messages.title = _("Create Folder");
        ud->messages.question = _("Create folder?");
@@ -2277,10 +2290,11 @@ void file_util_delete(FileData *source_fd, GList *source_list, GtkWidget *parent
        file_util_delete_full(source_fd, source_list, parent, options->file_ops.confirm_delete ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING);
 }
 
-void file_util_write_metadata(FileData *source_fd, GList *source_list, GtkWidget *parent)
+void file_util_write_metadata(FileData *source_fd, GList *source_list, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
 {
        file_util_write_metadata_full(source_fd, source_list, parent, 
-                                     (options->metadata.save_in_image_file && options->metadata.confirm_write) ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING);
+                                     (options->metadata.save_in_image_file && options->metadata.confirm_write) ? UTILITY_PHASE_START : UTILITY_PHASE_ENTERING,
+                                     done_func, done_data);
 }
 
 void file_util_copy(FileData *source_fd, GList *source_list, const gchar *dest_path, GtkWidget *parent)
@@ -2342,9 +2356,9 @@ void file_util_delete_dir(FileData *fd, GtkWidget *parent)
        file_util_delete_dir_full(fd, parent, UTILITY_PHASE_START);
 }
 
-void file_util_create_dir(FileData *dir_fd, GtkWidget *parent)
+void file_util_create_dir(FileData *dir_fd, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data)
 {
-       file_util_create_dir_full(dir_fd, NULL, parent, UTILITY_PHASE_ENTERING);
+       file_util_create_dir_full(dir_fd, NULL, parent, UTILITY_PHASE_ENTERING, done_func, done_data);
 }
 
 void file_util_rename_dir(FileData *source_fd, const gchar *new_path, GtkWidget *parent)

diff --git a/src/utilops.h b/src/utilops.h
index b08508f..e335202 100644 (file)
--- a/src/utilops.h
+++ b/src/utilops.h
@@ -17,7 +17,6 @@
 
 #include "ui_utildlg.h"
 
-
 void file_maint_renamed(FileData *fd);
 void file_maint_removed(FileData *fd, GList *ignore_list);
 void file_maint_moved(FileData *fd, GList *ignore_list);
@@ -38,9 +37,10 @@ void file_util_delete(FileData *source_fd, GList *source_list, GtkWidget *parent
 void file_util_move(FileData *source_fd, GList *source_list, const gchar *dest_path, GtkWidget *parent);
 void file_util_copy(FileData *source_fd, GList *source_list, const gchar *dest_path, GtkWidget *parent);
 void file_util_rename(FileData *source_fd, GList *source_list, GtkWidget *parent);
-void file_util_write_metadata(FileData *source_fd, GList *source_list, GtkWidget *parent);
+void file_util_write_metadata(FileData *source_fd, GList *source_list, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data);
+
+void file_util_create_dir(FileData *dir_fd, GtkWidget *parent, FileUtilDoneFunc done_func, gpointer done_data);
 
-void file_util_create_dir(FileData *dir_fd, GtkWidget *parent);
 void file_util_rename_dir(FileData *source_fd, const gchar *new_path, GtkWidget *parent);
 
 /* these avoid the location entry dialog, list must be files only and

diff --git a/src/view_dir.c b/src/view_dir.c
index 9bffead..7b6bce9 100644 (file)
--- a/src/view_dir.c
+++ b/src/view_dir.c
@@ -506,6 +506,31 @@ static void vd_toggle_show_hidden_files_cb(GtkWidget *widget, gpointer data)
        if (vd->layout) layout_refresh(vd->layout);
 }
 
+static void vd_pop_menu_new_rename_cb(gboolean success, const gchar *new_path, gpointer data)
+{
+       ViewDir *vd = data;
+       FileData *fd = NULL;
+       if (!success) return;
+
+       switch(vd->type)
+               {
+               case DIRVIEW_LIST:
+                       {
+                       vd_refresh(vd);
+                       fd = vdlist_row_by_path(vd, new_path, NULL);
+                       };
+                       break;
+               case DIRVIEW_TREE:
+                       {
+                       FileData *new_fd = file_data_new_simple(new_path);
+                       fd = vdtree_populate_path(vd, new_fd, TRUE, TRUE);
+                       file_data_unref(new_fd);
+                       }
+                       break;
+               }
+       vd_rename_by_data(vd, fd);
+}
+
 static void vd_pop_menu_new_cb(GtkWidget *widget, gpointer data)
 {
        ViewDir *vd = data;
@@ -527,41 +552,7 @@ static void vd_pop_menu_new_cb(GtkWidget *widget, gpointer data)
                        break;
                }
 
-       file_util_create_dir(dir_fd, widget);
-
-/* FIXME:*/
-#if 0
-       if (!mkdir_utf8(new_path, 0755))
-               {
-               gchar *text;
-
-               text = g_strdup_printf(_("Unable to create folder:\n%s"), new_path);
-               file_util_warning_dialog(_("Error creating folder"), text, GTK_STOCK_DIALOG_ERROR, vd->view);
-               g_free(text);
-               }
-       else
-               {
-               FileData *fd = NULL;
-
-               switch(vd->type)
-                       {
-                       case DIRVIEW_LIST:
-                               {
-                               vd_refresh(vd);
-                               fd = vdlist_row_by_path(vd, new_path, NULL);
-                               };
-                               break;
-                       case DIRVIEW_TREE:
-                               {
-                               FileData *new_fd = file_data_new_simple(new_path);
-                               fd = vdtree_populate_path(vd, new_fd, TRUE, TRUE);
-                               file_data_unref(new_fd);
-                               }
-                               break;
-                       }
-               vd_rename_by_data(vd, fd);
-               }
-#endif
+       file_util_create_dir(dir_fd, widget, vd_pop_menu_new_rename_cb, vd);
 }
 
 static void vd_pop_menu_rename_cb(GtkWidget *widget, gpointer data)