aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-02-21 17:17:13 +0800
committerGuillaume Desmottes <guillaume.desmottes@collabora.co.uk>2011-02-21 17:17:49 +0800
commit7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921 (patch)
tree0d49400de8b28a4e86fc65fee4457168130d7c67
parent72b084c00c702917f32cc3f750fb648d9e191d2c (diff)
downloadgsoc2013-empathy-7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921.tar
gsoc2013-empathy-7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921.tar.gz
gsoc2013-empathy-7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921.tar.bz2
gsoc2013-empathy-7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921.tar.lz
gsoc2013-empathy-7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921.tar.xz
gsoc2013-empathy-7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921.tar.zst
gsoc2013-empathy-7c0535692bcdc2c3cc0614ebd06e2bf24cdfd921.zip
use champlain_view_ensure_layers_visible()
-rw-r--r--libempathy-gtk/empathy-individual-widget.c4
-rw-r--r--src/empathy-map-view.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/libempathy-gtk/empathy-individual-widget.c b/libempathy-gtk/empathy-individual-widget.c
index 5ff293fd2..51e6a534e 100644
--- a/libempathy-gtk/empathy-individual-widget.c
+++ b/libempathy-gtk/empathy-individual-widget.c
@@ -729,7 +729,6 @@ location_update (EmpathyIndividualWidget *self)
if (display_map == TRUE)
{
ChamplainMarkerLayer *layer;
- ChamplainBoundingBox *bbox;
priv->map_view_embed = gtk_champlain_embed_new ();
priv->map_view = gtk_champlain_embed_get_view (
@@ -804,8 +803,7 @@ location_update (EmpathyIndividualWidget *self)
}
/* Zoom to show all of the markers */
- bbox = champlain_layer_get_bounding_box (CHAMPLAIN_LAYER (layer));
- champlain_view_ensure_visible (priv->map_view, bbox, FALSE);
+ champlain_view_ensure_layers_visible (priv->map_view, FALSE);
gtk_widget_show_all (priv->viewport_map);
}
diff --git a/src/empathy-map-view.c b/src/empathy-map-view.c
index 675f7c4d7..b7a2e1975 100644
--- a/src/empathy-map-view.c
+++ b/src/empathy-map-view.c
@@ -178,10 +178,8 @@ map_view_zoom_fit_cb (GtkWidget *widget,
EmpathyMapView *self)
{
EmpathyMapViewPriv *priv = GET_PRIV (self);
- ChamplainBoundingBox *bbox;
- bbox = champlain_layer_get_bounding_box (CHAMPLAIN_LAYER (priv->layer));
- champlain_view_ensure_visible (priv->map_view, bbox, TRUE);
+ champlain_view_ensure_layers_visible (priv->map_view, TRUE);
}
static gboolean