Include a Other Software section in Help file

[geeqie.git] / src / bar_gps.c

diff --git a/src/bar_gps.c b/src/bar_gps.c
index 40bb368..c511afd 100644 (file)
--- a/src/bar_gps.c
+++ b/src/bar_gps.c
@@ -216,7 +216,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *gd, gpointer data)
                                                        bar_pane_gps_close_cancel_cb, pgd);
                                generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION,
                                                        _("Write lat/long to meta-data?"),
-                                                       message->str);
+                                                       message->str, TRUE);
 
                                generic_dialog_add_button(gd, GTK_STOCK_SAVE, NULL,
                                                                                                bar_pane_gps_close_save_cb, TRUE);
@@ -230,7 +230,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *gd, gpointer data)
 
        if (info == TARGET_TEXT_PLAIN)
                {
-               location = decode_geo_parameters(gtk_selection_data_get_data(selection_data));
+               location = decode_geo_parameters((gchar *)gtk_selection_data_get_data(selection_data));
                if (!(g_strstr_len(location,-1,"Error")))
                        {
                        latlong = g_strsplit(location, " ", 2);
@@ -519,13 +519,6 @@ static void bar_pane_gps_update(PaneGPSData *pgd)
 {
        GList *list;
 
-       /* The widget does not have a parent during bar_pane_gps_new, so calling gtk_widget_show_all there gives a
-        * "Gtk-CRITICAL **: gtk_widget_realize: assertion `GTK_WIDGET_ANCHORED (widget) || GTK_IS_INVISIBLE (widget)' failed"
-        * error. gtk_widget_show_all can be given after it has been added to the bar.
-        */
-       if (gtk_widget_get_parent(pgd->widget) != NULL)
-               gtk_widget_show_all(pgd->widget);
-
        /* If a create-marker background process is running, kill it
         * and start again
         */
@@ -850,7 +843,7 @@ void bar_pane_gps_map_centreing(PaneGPSData *pgd)
        gd = generic_dialog_new(_("Map centering"),
                                "map_centering", NULL, TRUE, NULL, pgd);
        generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO,
-                               "Map Centering", message->str);
+                               "Map Centering", message->str, TRUE);
        generic_dialog_add_button(gd, GTK_STOCK_OK, NULL, NULL, TRUE);
 
        gtk_widget_show(gd->dialog);
@@ -941,6 +934,7 @@ GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *ma
        pgd->height = height;
 
        frame = gtk_frame_new(NULL);
+       DEBUG_NAME(frame);
        vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
 
        gpswidget = gtk_champlain_embed_new();
@@ -1022,7 +1016,7 @@ GtkWidget *bar_pane_gps_new_from_config(const gchar **attribute_names, const gch
        gdouble latitude;
        gdouble longitude;
        /* Latitude and longitude are stored in the config file as an integer of
-        * (actual value * 1,000,000). There is no READ_DOUBLE utilty function.
+        * (actual value * 1,000,000). There is no READ_DOUBLE utility function.
         */
        gint int_latitude = 54000000;
        gint int_longitude = -4000000;
@@ -1055,8 +1049,8 @@ GtkWidget *bar_pane_gps_new_from_config(const gchar **attribute_names, const gch
                }
 
        bar_pane_translate_title(PANE_COMMENT, id, &title);
-       latitude = int_latitude / 1000000;
-       longitude = int_longitude / 1000000;
+       latitude = (gdouble)int_latitude / 1000000;
+       longitude = (gdouble)int_longitude / 1000000;
        ret = bar_pane_gps_new(id, title, map_id, zoom, latitude, longitude, expanded, height);
        g_free(title);
        g_free(map_id);