Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

[geeqie.git] / src / bar-keywords.cc

diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc
index 709032d..4076b8e 100644 (file)
--- a/src/bar-keywords.cc
+++ b/src/bar-keywords.cc
@@ -236,7 +236,7 @@ static void bar_pane_keywords_update(PaneKeywordsData *pkd)
 
        while (work1 && work2)
                {
-               if (strcmp(work1->data, work2->data) != 0) break;
+               if (strcmp(static_cast<const gchar *>(work1->data), static_cast<const gchar *>(work2->data)) != 0) break;
                work1 = work1->next;
                work2 = work2->next;
                }
@@ -321,7 +321,7 @@ static void bar_pane_keywords_write_config(GtkWidget *pane, GString *outstr, gin
        g_list_first(path_expanded);
        while (path_expanded)
                {
-               bar_pane_keywords_entry_write_config(path_expanded->data, outstr, indent);
+               bar_pane_keywords_entry_write_config(static_cast<gchar *>(path_expanded->data), outstr, indent);
                g_free(path_expanded->data);
                path_expanded = path_expanded->next;
                }
@@ -504,7 +504,7 @@ static gboolean bar_pane_keywords_changed_idle_cb(gpointer data)
        bar_pane_keywords_write(pkd);
        bar_keyword_tree_sync(pkd);
        pkd->idle_id = 0;
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void bar_pane_keywords_changed(GtkTextBuffer *UNUSED(buffer), gpointer data)
@@ -525,15 +525,15 @@ static void bar_pane_keywords_changed(GtkTextBuffer *UNUSED(buffer), gpointer da
 
 
 static GtkTargetEntry bar_pane_keywords_drag_types[] = {
-       { TARGET_APP_KEYWORD_PATH_STRING, GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>(TARGET_APP_KEYWORD_PATH_STRING), GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_keywords_drag_types = 2;
 
 
 static GtkTargetEntry bar_pane_keywords_drop_types[] = {
-       { TARGET_APP_KEYWORD_PATH_STRING, GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>(TARGET_APP_KEYWORD_PATH_STRING), GTK_TARGET_SAME_WIDGET, TARGET_APP_KEYWORD_PATH },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_keywords_drop_types = 2;
 
@@ -560,7 +560,7 @@ static void bar_pane_keywords_dnd_get(GtkWidget *tree_view, GdkDragContext *UNUS
                        {
                        GList *path = keyword_tree_get_path(keyword_tree, &child_iter);
                        gtk_selection_data_set(selection_data, gtk_selection_data_get_target(selection_data),
-                                              8, (gpointer) &path, sizeof(path));
+                                              8, reinterpret_cast<const guchar *>(&path), sizeof(path));
                        break;
                        }
 
@@ -680,7 +680,7 @@ static void bar_pane_keywords_dnd_receive(GtkWidget *tree_view, GdkDragContext *
                {
                case TARGET_APP_KEYWORD_PATH:
                        {
-                       GList *path = *(gpointer *)gtk_selection_data_get_data(selection_data);
+                       GList *path = static_cast<GList *>(*(gpointer *)(gtk_selection_data_get_data(selection_data)));
                        src_valid = keyword_tree_get_iter(keyword_tree, &src_kw_iter, path);
                        string_list_free(path);
                        break;
@@ -863,9 +863,9 @@ static void bar_pane_keywords_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer dat
        if (cdd->edit_existing)
                {
                if (keywords && keywords->data && /* there should be one keyword */
-                   !keyword_exists(keyword_tree, NULL, &kw_iter, keywords->data, TRUE, NULL))
+                   !keyword_exists(keyword_tree, NULL, &kw_iter, static_cast<const gchar *>(keywords->data), TRUE, NULL))
                        {
-                       keyword_set(GTK_TREE_STORE(keyword_tree), &kw_iter, keywords->data, cdd->is_keyword);
+                       keyword_set(GTK_TREE_STORE(keyword_tree), &kw_iter, static_cast<const gchar *>(keywords->data), cdd->is_keyword);
                        }
                }
        else
@@ -876,7 +876,7 @@ static void bar_pane_keywords_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer dat
                while (work)
                        {
                        GtkTreeIter add;
-                       if (keyword_exists(keyword_tree, NULL, (have_dest || append_to) ? &kw_iter : NULL, work->data, FALSE, NULL))
+                       if (keyword_exists(keyword_tree, NULL, (have_dest || append_to) ? &kw_iter : NULL, static_cast<const gchar *>(work->data), FALSE, NULL))
                                {
                                work = work->next;
                                continue;
@@ -895,7 +895,7 @@ static void bar_pane_keywords_edit_ok_cb(GenericDialog *UNUSED(gd), gpointer dat
                                append_to = TRUE;
                                kw_iter = add;
                                }
-                       keyword_set(GTK_TREE_STORE(keyword_tree), &add, work->data, cdd->is_keyword);
+                       keyword_set(GTK_TREE_STORE(keyword_tree), &add, static_cast<const gchar *>(work->data), cdd->is_keyword);
                        work = work->next;
                        }
                }
@@ -1600,9 +1600,9 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
        gtk_tree_view_set_expander_column(GTK_TREE_VIEW(pkd->keyword_treeview), column);
 
        gtk_drag_source_set(pkd->keyword_treeview,
-                           GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,
+                           static_cast<GdkModifierType>(GDK_BUTTON1_MASK | GDK_BUTTON2_MASK),
                            bar_pane_keywords_drag_types, n_keywords_drag_types,
-                           GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK);
+                           static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE | GDK_ACTION_LINK));
 
        g_signal_connect(G_OBJECT(pkd->keyword_treeview), "drag_data_get",
                         G_CALLBACK(bar_pane_keywords_dnd_get), pkd);
@@ -1613,9 +1613,9 @@ static GtkWidget *bar_pane_keywords_new(const gchar *id, const gchar *title, con
                         G_CALLBACK(bar_pane_keywords_dnd_end), pkd);
 
        gtk_drag_dest_set(pkd->keyword_treeview,
-                         GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP,
+                         static_cast<GtkDestDefaults>(GTK_DEST_DEFAULT_MOTION | GTK_DEST_DEFAULT_HIGHLIGHT | GTK_DEST_DEFAULT_DROP),
                          bar_pane_keywords_drop_types, n_keywords_drop_types,
-                         GDK_ACTION_COPY | GDK_ACTION_MOVE);
+                         static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE));
 
        g_signal_connect(G_OBJECT(pkd->keyword_treeview), "drag_data_received",
                         G_CALLBACK(bar_pane_keywords_dnd_receive), pkd);
@@ -1985,7 +1985,7 @@ gboolean bar_keywords_autocomplete_focus(LayoutWindow *lw)
                }
        else
                {
-               gtk_widget_grab_focus(children->data);
+               gtk_widget_grab_focus(GTK_WIDGET(children->data));
                ret = FALSE;
                }