Minor change to avoid SEGFAULT on x86_64

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

diff --git a/src/expedia.c b/src/expedia.c
index bb07f457f3fffbf1faf96a4355f5b3f8c3f6bd8f..bc7b60864f9fb1596be853a9ee5c1dab33747a6b 100644 (file)
--- a/src/expedia.c
+++ b/src/expedia.c
@@ -37,6 +37,8 @@ static gboolean expedia_coord_to_mapcoord ( const VikCoord *src, gdouble xzoom,
 static void expedia_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest );
 static int expedia_download ( MapCoord *src, const gchar *dest_fn );
 
 static void expedia_mapcoord_to_center_coord ( MapCoord *src, VikCoord *dest );
 static int expedia_download ( MapCoord *src, const gchar *dest_fn );
 

+static DownloadOptions expedia_options = { 0 };
+

 void expedia_init() {
   VikMapsLayer_MapType map_type = { 5, 0, 0, VIK_VIEWPORT_DRAWMODE_EXPEDIA, expedia_coord_to_mapcoord, expedia_mapcoord_to_center_coord, expedia_download };
   maps_layer_register_type("Expedia Street Maps", 5, &map_type);
 void expedia_init() {
   VikMapsLayer_MapType map_type = { 5, 0, 0, VIK_VIEWPORT_DRAWMODE_EXPEDIA, expedia_coord_to_mapcoord, expedia_mapcoord_to_center_coord, expedia_download };
   maps_layer_register_type("Expedia Street Maps", 5, &map_type);


@@ -176,7 +178,7 @@ static int expedia_download ( MapCoord *src, const gchar *dest_fn )
   uri = g_strdup_printf ( "/pub/agent.dll?qscr=mrdt&ID=3XNsF.&CenP=%lf,%lf&Lang=%s&Alti=%d&Size=%d,%d&Offs=0.000000,0.000000&BCheck&tpid=1",
                ll.lat, ll.lon, (ll.lon > -30) ? "EUR0809" : "USA0409", src->scale, width, height );
 
   uri = g_strdup_printf ( "/pub/agent.dll?qscr=mrdt&ID=3XNsF.&CenP=%lf,%lf&Lang=%s&Alti=%d&Size=%d,%d&Offs=0.000000,0.000000&BCheck&tpid=1",
                ll.lat, ll.lon, (ll.lon > -30) ? "EUR0809" : "USA0409", src->scale, width, height );
 

-  if ((res = a_http_download_get_url_nohostname ( "expedia.com", uri, dest_fn )) == 0) /* All OK */
+  if ((res = a_http_download_get_url ( "expedia.com", uri, dest_fn, &expedia_options )) == 0)  /* All OK */

        expedia_snip ( dest_fn );
   return(res);
 }
        expedia_snip ( dest_fn );
   return(res);
 }