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 6316644..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;
 
@@ -115,7 +115,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
        work = g_list_first(pgd->geocode_list);
        while (work)
                {
-               fd = work->data;
+               fd = static_cast<FileData *>(work->data);
                if (fd->name && !fd->parent)
                        {
                        work = work->next;
@@ -142,7 +142,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
        gchar *location;
        gchar **latlong;
 
-       pgd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pgd) return;
 
        if (info == TARGET_URI_LIST)
@@ -161,7 +161,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
                        work = list;
                        while (work)
                                {
-                               fd = work->data;
+                               fd = static_cast<FileData *>(work->data);
                                work = work->next;
                                if (fd->name && !fd->parent)
                                        {
@@ -182,7 +182,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *UNUSED(gd), gpointer data)
                                message = g_string_new("");
                                if (count == 1)
                                        {
-                                       fd_found = g_list_first(pgd->geocode_list)->data;
+                                       fd_found = static_cast<FileData *>(g_list_first(pgd->geocode_list)->data);
                                        g_string_append_printf(message,
                                                        _("\nDo you want to geocode image %s?"), fd_found->name);
                                        }
@@ -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);
 
@@ -279,7 +279,7 @@ static void bar_pane_gps_thumb_done_cb(ThumbLoader *tl, gpointer data)
        ClutterActor *actor;
 
        marker = CLUTTER_ACTOR(data);
-       fd = g_object_get_data(G_OBJECT(marker), "file_fd");
+       fd = static_cast<FileData *>(g_object_get_data(G_OBJECT(marker), "file_fd"));
        if (fd->thumb_pixbuf != NULL)
                {
                actor = gtk_clutter_texture_new();
@@ -306,14 +306,15 @@ 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;
 
        if (bevent->button == MOUSE_BUTTON_LEFT)
                {
                label_marker = CLUTTER_ACTOR(widget);
-               fd = g_object_get_data(G_OBJECT(label_marker), "file_fd");
+               fd = static_cast<FileData *>(g_object_get_data(G_OBJECT(label_marker), "file_fd"));
 
                /* If the marker is showing a thumbnail, delete it
                 */
@@ -452,7 +453,7 @@ static gboolean bar_pane_gps_create_markers_cb(gpointer data)
 
        if(pgd->not_added)
                {
-               fd = pgd->not_added->data;
+               fd = static_cast<FileData *>(pgd->not_added->data);
                pgd->not_added = pgd->not_added->next;
 
                latitude = metadata_read_GPS_coord(fd, "Xmp.exif.GPSLatitude", 0);
@@ -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)
@@ -623,7 +624,7 @@ static void bar_pane_gps_change_map_cb(GtkWidget *widget, gpointer data)
 
        if (!pgd) return;
 
-       mapsource = g_object_get_data(G_OBJECT(widget), "menu_item_radio_data");
+       mapsource = static_cast<gchar *>(g_object_get_data(G_OBJECT(widget), "menu_item_radio_data"));
        bar_pane_gps_set_map_source(pgd, mapsource);
 }
 
@@ -633,7 +634,7 @@ static void bar_pane_gps_notify_selection(GtkWidget *bar, gint count)
 
        if (count == 0) return;
 
-       pgd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pgd) return;
 
        bar_pane_gps_update(pgd);
@@ -643,7 +644,7 @@ static void bar_pane_gps_set_fd(GtkWidget *bar, FileData *fd)
 {
        PaneGPSData *pgd;
 
-       pgd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pgd) return;
 
        file_data_unref(pgd->fd);
@@ -656,7 +657,7 @@ static gint bar_pane_gps_event(GtkWidget *bar, GdkEvent *event)
 {
        PaneGPSData *pgd;
 
-       pgd = g_object_get_data(G_OBJECT(bar), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(bar), "pane_data"));
        if (!pgd) return FALSE;
 
        if (gtk_widget_has_focus(pgd->widget)) return gtk_widget_event(GTK_WIDGET(pgd->widget), event);
@@ -676,7 +677,7 @@ static void bar_pane_gps_write_config(GtkWidget *pane, GString *outstr, gint ind
        gint int_position;
        gint w, h;
 
-       pgd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pgd) return;
 
        WRITE_NL();
@@ -1078,7 +1079,7 @@ void bar_pane_gps_update_from_config(GtkWidget *pane, const gchar **attribute_na
        gint int_longitude, int_latitude;
        gdouble longitude, latitude;
 
-       pgd = g_object_get_data(G_OBJECT(pane), "pane_data");
+       pgd = static_cast<PaneGPSData *>(g_object_get_data(G_OBJECT(pane), "pane_data"));
        if (!pgd)
                return;