Fix uniquify tracks to use the appropriate sort order.

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

diff --git a/src/vikgototool.c b/src/vikgototool.c
index b6516c3f2a7c1edf08a9296481ce658b9c1c5267..fa5d263d7a6d69c9fb249e46b9f638076a90a234 100644 (file)
--- a/src/vikgototool.c
+++ b/src/vikgototool.c
@@ -25,7 +25,6 @@
 
 #include "vikgototool.h"
 #include "util.h"
 
 #include "vikgototool.h"
 #include "util.h"

-#include "curl_download.h"

 
 #include <string.h>
 
 
 #include <string.h>
 


@@ -207,8 +206,6 @@ gboolean vik_goto_tool_parse_file_for_latlon (VikGotoTool *self, gchar *filename
 
 int vik_goto_tool_get_coord ( VikGotoTool *self, VikWindow *vw, VikViewport *vvp, gchar *srch_str, VikCoord *coord )
 {
 
 int vik_goto_tool_get_coord ( VikGotoTool *self, VikWindow *vw, VikViewport *vvp, gchar *srch_str, VikCoord *coord )
 {

-  FILE *tmp_file;
-  int tmp_fd;

   gchar *tmpname;
   gchar *uri;
   gchar *escaped_srch_str;
   gchar *tmpname;
   gchar *uri;
   gchar *escaped_srch_str;


@@ -221,24 +218,10 @@ int vik_goto_tool_get_coord ( VikGotoTool *self, VikWindow *vw, VikViewport *vvp
 
   g_debug("%s: escaped goto: %s", __FUNCTION__, escaped_srch_str);
 
 
   g_debug("%s: escaped goto: %s", __FUNCTION__, escaped_srch_str);
 

-  if ((tmp_fd = g_file_open_tmp ("vikgoto.XXXXXX", &tmpname, NULL)) == -1) {
-    g_critical(_("couldn't open temp file"));
-    return -1;
-  }
-  
-  tmp_file = fdopen(tmp_fd, "r+");

   uri = g_strdup_printf(vik_goto_tool_get_url_format(self), escaped_srch_str);
 
   uri = g_strdup_printf(vik_goto_tool_get_url_format(self), escaped_srch_str);
 

-  /* TODO: curl may not be available */
-  if (curl_download_uri(uri, tmp_file, vik_goto_tool_get_download_options(self), 0, NULL)) {  /* error */
-    fclose(tmp_file);
-    tmp_file = NULL;
-    ret = -1;
-    goto done;
-  }
+  tmpname = a_download_uri_to_tmp_file ( uri, vik_goto_tool_get_download_options(self) );

 
 

-  fclose(tmp_file);
-  tmp_file = NULL;

   g_debug("%s: %s", __FILE__, tmpname);
   if (!vik_goto_tool_parse_file_for_latlon(self, tmpname, &ll)) {
     ret = -1;
   g_debug("%s: %s", __FILE__, tmpname);
   if (!vik_goto_tool_parse_file_for_latlon(self, tmpname, &ll)) {
     ret = -1;


@@ -249,7 +232,7 @@ int vik_goto_tool_get_coord ( VikGotoTool *self, VikWindow *vw, VikViewport *vvp
 done:
   g_free(escaped_srch_str);
   g_free(uri);
 done:
   g_free(escaped_srch_str);
   g_free(uri);

-  g_remove(tmpname);
+  util_remove(tmpname);

   g_free(tmpname);
   return ret;
 }
   g_free(tmpname);
   return ret;
 }