Documentation: Use G_SOURCE_CONTINUE and G_SOURCE_REMOVE

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

diff --git a/src/bar-gps.cc b/src/bar-gps.cc
index c93fbd0..d0abf24 100644 (file)
--- a/src/bar-gps.cc
+++ b/src/bar-gps.cc
@@ -94,8 +94,8 @@ enum {
 };
 
 static GtkTargetEntry bar_pane_gps_drop_types[] = {
-       { "text/uri-list", 0, TARGET_URI_LIST },
-       { "text/plain", 0, TARGET_TEXT_PLAIN }
+       { const_cast<gchar *>("text/uri-list"), 0, TARGET_URI_LIST },
+       { const_cast<gchar *>("text/plain"), 0, TARGET_TEXT_PLAIN }
 };
 static gint n_gps_entry_drop_types = 2;
 
@@ -250,9 +250,9 @@ static void bar_pane_gps_dnd_init(gpointer data)
        PaneGPSData *pgd = static_cast<PaneGPSData *>(data);
 
        gtk_drag_dest_set(pgd->widget,
-                         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_gps_drop_types, n_gps_entry_drop_types,
-                         GDK_ACTION_COPY | GDK_ACTION_MOVE);
+                         static_cast<GdkDragAction>(GDK_ACTION_COPY | GDK_ACTION_MOVE));
        g_signal_connect(G_OBJECT(pgd->widget), "drag_data_received",
                         G_CALLBACK(bar_pane_gps_dnd_receive), NULL);
 
@@ -306,7 +306,8 @@ static gboolean bar_pane_gps_marker_keypress_cb(GtkWidget *widget, ClutterButton
        ClutterActor *actor, *direction;
        ClutterActor *current_image;
        GString *text;
-       gint height, width, rotate;
+       gint height, width;
+       GdkPixbufRotation rotate;
        gchar *altitude = NULL;
        ThumbLoader *tl;
 
@@ -499,7 +500,7 @@ static gboolean bar_pane_gps_create_markers_cb(gpointer data)
                        champlain_bounding_box_extend(pgd->bbox, latitude, longitude);
 
                        }
-               return TRUE;
+               return G_SOURCE_CONTINUE;
                }
 
        if (pgd->centre_map_checked)
@@ -518,7 +519,7 @@ static gboolean bar_pane_gps_create_markers_cb(gpointer data)
        gtk_progress_bar_set_text(GTK_PROGRESS_BAR(pgd->progress), NULL);
        pgd->create_markers_id = 0;
 
-       return FALSE;
+       return G_SOURCE_REMOVE;
 }
 
 static void bar_pane_gps_update(PaneGPSData *pgd)