Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / utilops.cc

diff --git a/src/utilops.cc b/src/utilops.cc
index 57e9181..27c2eec 100644 (file)
--- a/src/utilops.cc
+++ b/src/utilops.cc
@@ -41,8 +41,8 @@ static GdkPixbuf *file_util_get_error_icon(FileData *fd, GList *list, GtkWidget
 
 static GtkTargetEntry target_types[] =
 {
-       {(gchar *)"text/plain", 0, CLIPBOARD_TEXT_PLAIN},
-       {(gchar *)"text/uri-list", 0, CLIPBOARD_TEXT_URI_LIST},
+       {(gchar *)const_cast<gchar *>("text/plain"), 0, CLIPBOARD_TEXT_PLAIN},
+       {(gchar *)const_cast<gchar *>("text/uri-list"), 0, CLIPBOARD_TEXT_URI_LIST},
        {(gchar *)"x-special/gnome-copied-files", 0, CLIPBOARD_X_SPECIAL_GNOME_COPIED_FILES},
        {(gchar *)"UTF8_STRING", 0, CLIPBOARD_UTF8_STRING}
 };
@@ -278,11 +278,11 @@ enum {
 
 typedef struct _UtilityDataMessages UtilityDataMessages;
 struct _UtilityDataMessages {
-       gchar *title;
-       gchar *question;
-       gchar *desc_flist;
-       gchar *desc_source_fd;
-       gchar *fail;
+       const gchar *title;
+       const gchar *question;
+       const gchar *desc_flist;
+       const gchar *desc_source_fd;
+       const gchar *fail;
 };
 
 typedef struct _UtilityData UtilityData;
@@ -673,7 +673,7 @@ static gboolean file_util_perform_ci_internal(gpointer data)
 
                /* this is removed when ud is destroyed */
                ud->perform_idle_id = g_idle_add(file_util_perform_ci_internal, ud);
-               return TRUE;
+               return G_SOURCE_CONTINUE;
                }
 
        g_assert(ud->flist);
@@ -687,23 +687,23 @@ static gboolean file_util_perform_ci_internal(gpointer data)
                gboolean last = !ud->flist->next;
                EditorFlags status = EDITOR_ERROR_STATUS;
 
-               if (ud->with_sidecars ? file_data_sc_perform_ci(single_entry->data)
-                                     : file_data_perform_ci(single_entry->data))
-                       status = 0; /* OK */
+               if (ud->with_sidecars ? file_data_sc_perform_ci(static_cast<FileData *>(single_entry->data))
+                                     : file_data_perform_ci(static_cast<FileData *>(single_entry->data)))
+                       status = static_cast<EditorFlags>(0); /* OK */
 
                ret = file_util_perform_ci_cb(GINT_TO_POINTER(!last), status, single_entry, ud);
                g_list_free(single_entry);
 
-               if (ret == EDITOR_CB_SUSPEND || last) return FALSE;
+               if (ret == EDITOR_CB_SUSPEND || last) return G_SOURCE_REMOVE;
 
                if (ret == EDITOR_CB_SKIP)
                        {
                        file_util_perform_ci_cb(NULL, EDITOR_ERROR_SKIPPED, ud->flist, ud);
-                       return FALSE;
+                       return G_SOURCE_REMOVE;
                        }
                }
 
-       return TRUE;
+       return G_SOURCE_CONTINUE;
 }
 
 static void file_util_perform_ci_dir(UtilityData *ud, gboolean internal, gboolean ext_result)
@@ -1446,7 +1446,7 @@ static gboolean file_util_rename_idle_cb(gpointer data)
        file_util_rename_preview_update(ud);
 
        ud->update_idle_id = 0;
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void file_util_rename_preview_order_cb(GtkTreeModel *UNUSED(treemodel), GtkTreePath *UNUSED(tpath),
@@ -1731,7 +1731,7 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i
        pref_table_label(table, 0, 1, _("New name:"), 1.0);
 
        ud->rename_entry = gtk_entry_new();
-       gtk_table_attach(GTK_TABLE(table), ud->rename_entry, 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+       gtk_table_attach(GTK_TABLE(table), ud->rename_entry, 1, 2, 1, 2, static_cast<GtkAttachOptions>(GTK_EXPAND | GTK_FILL), static_cast<GtkAttachOptions>(0), 0, 0);
        generic_dialog_attach_default(GENERIC_DIALOG(ud->gd), ud->rename_entry);
        gtk_widget_grab_focus(ud->rename_entry);
 
@@ -1936,7 +1936,7 @@ static void file_util_warn_op_in_progress(const gchar *title)
 
 static void file_util_details_dialog_close_cb(GtkWidget *UNUSED(widget), gpointer data)
 {
-       gtk_widget_destroy(data);
+       gtk_widget_destroy(GTK_WIDGET(data));
 
 }
 
@@ -2953,7 +2953,7 @@ static gboolean file_util_write_metadata_first_after_done(gpointer data)
        g_free(dd->dest_path);
        g_free(dd->editor_key);
        g_free(dd);
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void file_util_write_metadata_first_done(gboolean success, const gchar *UNUSED(done_path), gpointer data)