[emerillon] Port to libchamplain 0.6



commit 9e4f2a7c6015406c0efa69395f0c21a3994d1404
Author: Å?ukasz JernaÅ? <deejay1 srem org>
Date:   Thu May 13 18:00:50 2010 +0200

    Port to libchamplain 0.6

 configure.ac            |    8 ++++----
 emerillon/window.c      |    6 ++----
 plugins/search/search.c |    8 ++++----
 3 files changed, 10 insertions(+), 12 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5a8b2e4..4b95776 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,8 +85,8 @@ GLIB_REQUIRED=2.12.0
 GTHREAD_REQUIRED=2.12.0
 GTK_REQUIRED=2.20.0
 GCONF_REQUIRED=2.5.90
-CHAMPLAIN_REQUIRED=0.4
-CHAMPLAIN_GTK_REQUIRED=0.4
+CHAMPLAIN_REQUIRED=0.6.0
+CHAMPLAIN_GTK_REQUIRED=0.6.0
 GEOCLUE_REQUIRED=0.11.1
 ETHOS_REQUIRED=0.2
 ETHOS_UI_REQUIRED=0.2
@@ -96,8 +96,8 @@ PKG_CHECK_MODULES(EMERILLON, [
     gthread-2.0 >= $GTHREAD_REQUIRED
     gtk+-2.0 >= $GTK_REQUIRED
     gconf-2.0 >= $GCONF_REQUIRED
-    champlain-0.4 >= $CHAMPLAIN_REQUIRED
-    champlain-gtk-0.4 >= $CHAMPLAIN_GTK_REQUIRED
+    champlain-0.6 >= $CHAMPLAIN_REQUIRED
+    champlain-gtk-0.6 >= $CHAMPLAIN_GTK_REQUIRED
     geoclue >= $GEOCLUE_REQUIRED
     ethos-1.0 >= $ETHOS_REQUIRED
     ethos-ui-1.0 >= $ETHOS_UI_REQUIRED
diff --git a/emerillon/window.c b/emerillon/window.c
index d0b855e..89f7b58 100644
--- a/emerillon/window.c
+++ b/emerillon/window.c
@@ -395,10 +395,8 @@ zoom_changed_cb (GtkWidget *widget,
   ChamplainMapSource *source = NULL;
 
   source = champlain_view_get_map_source (self->priv->view);
-  g_object_get (G_OBJECT (source),
-      "min-zoom-level", &min_zoom_level,
-      "max-zoom-level", &max_zoom_level,
-      NULL);
+  min_zoom_level = champlain_map_source_get_min_zoom_level (source);
+  max_zoom_level = champlain_map_source_get_max_zoom_level (source);
 
   zoom_in_action = gtk_action_group_get_action (self->priv->main_actions,
         "ViewZoomIn");
diff --git a/plugins/search/search.c b/plugins/search/search.c
index 2a6a80d..92a32dc 100644
--- a/plugins/search/search.c
+++ b/plugins/search/search.c
@@ -119,10 +119,10 @@ result_cb (RestProxyCall *call,
   n = rest_xml_node_find (root, "geoname");
   i = 1;
 
-  min_lat = CHAMPLAIN_MAX_LAT;
-  max_lat = CHAMPLAIN_MIN_LAT;
-  min_lon = CHAMPLAIN_MAX_LONG;
-  max_lon = CHAMPLAIN_MIN_LONG;
+  min_lat = 90;
+  max_lat = -90;
+  min_lon = 180;
+  max_lon = -180;
 
   while (n)
     {



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]