From 0810881fb9e32569bca8bfc40bdeb66b22995ff8 Mon Sep 17 00:00:00 2001 From: Guilhem Bonnefille Date: Sun, 6 Dec 2009 23:55:59 +0100 Subject: [PATCH] Move common last search code to viksearch.c --- src/googlesearch.c | 12 ------------ src/viksearch.c | 7 +++++++ 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/googlesearch.c b/src/googlesearch.c index 9488c2f2..a4643089 100644 --- a/src/googlesearch.c +++ b/src/googlesearch.c @@ -41,10 +41,6 @@ #define GOOGLE_SEARCH_PATTERN_2 ",lng:" #define GOOGLE_SEARCH_NOT_FOUND "not understand the location" -static gchar *last_search_str = NULL; -static VikCoord *last_coord = NULL; -static gchar *last_successful_search_str = NULL; - static DownloadOptions googlesearch_options = { "http://maps.google.com/", 0, a_check_map_file }; static void google_search_tool_class_init ( GoogleSearchToolClass *klass ); @@ -216,14 +212,6 @@ static int google_search_tool_get_coord ( VikSearchTool *self, VikWindow *vw, Vi vik_coord_load_from_latlon ( coord, vik_viewport_get_coord_mode(vvp), &ll ); - if (last_coord) - g_free(last_coord); - last_coord = g_malloc(sizeof(VikCoord)); - *last_coord = *coord; - if (last_successful_search_str) - g_free(last_successful_search_str); - last_successful_search_str = g_strdup(last_search_str); - done: g_free(escaped_srch_str); g_free(uri); diff --git a/src/viksearch.c b/src/viksearch.c index e74b4fa8..1e4003cb 100644 --- a/src/viksearch.c +++ b/src/viksearch.c @@ -173,6 +173,13 @@ void a_vik_search(VikWindow *vw, VikLayersPanel *vlp, VikViewport *vvp) } else if (!vik_search_tool_get_coord(g_list_nth_data (search_tools_list, last_search_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_search_str) + g_free(last_successful_search_str); + last_successful_search_str = g_strdup(last_search_str); vik_viewport_set_center_coord(vvp, &new_center); vik_layers_panel_emit_update(vlp); more = FALSE; -- 2.11.4.GIT