Remove the now unused viewport alpha pixbuf and gdk pixbuf compositing method.

[andy/viking.git] / src / vikgoto.c

diff --git a/src/vikgoto.c b/src/vikgoto.c
index 27e5b3fa6120965d170e98d82f12c13c1246b397..b223ebaabeb9e6e794bad0e39ac318360d3668d4 100644 (file)
--- a/src/vikgoto.c
+++ b/src/vikgoto.c
@@ -31,7 +31,6 @@
 #include <glib/gi18n.h>
 
 #include "viking.h"
-#include "util.h"
 #include "vikgototool.h"
 #include "vikgoto.h"
 
@@ -85,7 +84,7 @@ static void display_no_tool(VikWindow *vw)
   gtk_widget_destroy(dialog);
 }
 
-static gboolean prompt_try_again(VikWindow *vw)
+static gboolean prompt_try_again(VikWindow *vw, const gchar *msg)
 {
   GtkWidget *dialog = NULL;
   gboolean ret = TRUE;
@@ -93,7 +92,7 @@ static gboolean prompt_try_again(VikWindow *vw)
   dialog = gtk_dialog_new_with_buttons ( "", GTK_WINDOW(vw), 0, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, NULL );
   gtk_window_set_title(GTK_WINDOW(dialog), _("goto"));
 
-  GtkWidget *goto_label = gtk_label_new(_("I don't know that place. Do you want another goto?"));
+  GtkWidget *goto_label = gtk_label_new(msg);
   gtk_box_pack_start ( GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), goto_label, FALSE, FALSE, 5 );
   gtk_dialog_set_default_response ( GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT );
   gtk_widget_show_all(dialog);
@@ -241,20 +240,26 @@ void a_vik_goto(VikWindow *vw, VikViewport *vvp)
     if ((!s_str) || (s_str[0] == 0)) {
       more = FALSE;
     }
-
-    else if (!vik_goto_tool_get_coord(g_list_nth_data (goto_tools_list, last_goto_tool), vw, vvp, s_str, &new_center)) {
-      if (last_coord)
-        g_free(last_coord);
-      last_coord = g_malloc(sizeof(VikCoord));
-      *last_coord = new_center;
-      if (last_successful_goto_str)
-        g_free(last_successful_goto_str);
-      last_successful_goto_str = g_strdup(last_goto_str);
-      vik_viewport_set_center_coord(vvp, &new_center);
-      more = FALSE;
-    }
-    else if (!prompt_try_again(vw))
+    else {
+      int ans = vik_goto_tool_get_coord(g_list_nth_data (goto_tools_list, last_goto_tool), vw, vvp, s_str, &new_center);
+      if ( ans == 0 ) {
+        if (last_coord)
+          g_free(last_coord);
+        last_coord = g_malloc(sizeof(VikCoord));
+        *last_coord = new_center;
+        if (last_successful_goto_str)
+          g_free(last_successful_goto_str);
+        last_successful_goto_str = g_strdup(last_goto_str);
+        vik_viewport_set_center_coord(vvp, &new_center, TRUE);
         more = FALSE;
+      }
+      else if ( ans == -1 ) {
+        if (!prompt_try_again(vw, _("I don't know that place. Do you want another goto?")))
+          more = FALSE;
+      }
+      else if (!prompt_try_again(vw, _("Service request failure. Do you want another goto?")))
+        more = FALSE;
+    }
     g_free(s_str);
   } while (more);
 }
@@ -299,8 +304,8 @@ gint a_vik_goto_where_am_i ( VikViewport *vvp, struct LatLon *ll, gchar **name )
 
   gchar lat_buf[32], lon_buf[32];
   lat_buf[0] = lon_buf[0] = '\0';
-  gchar *country;
-  gchar *city;
+  gchar *country = NULL;
+  gchar *city = NULL;
 
   if ((mf = g_mapped_file_new(tmpname, FALSE, NULL)) == NULL) {
     g_critical(_("couldn't map temp file"));
@@ -404,7 +409,7 @@ gint a_vik_goto_where_am_i ( VikViewport *vvp, struct LatLon *ll, gchar **name )
   
  tidy:
   g_mapped_file_unref ( mf );
-  g_remove ( tmpname );
+  (void)g_remove ( tmpname );
   g_free ( tmpname );
   return result;
 }