LIBNOTIFY_REQUIRED=0.4.4
LIBCANBERRA_GTK_REQUIRED=0.4
GEOCLUE_REQUIRED=0.11
-LIBCHAMPLAIN_REQUIRED=0.2.6
-LIBCHAMPLAIN_GTK_REQUIRED=0.2.6
+LIBCHAMPLAIN_REQUIRED=0.3.0
+LIBCHAMPLAIN_GTK_REQUIRED=0.3.0
CLUTTER_GTK_REQUIRED=0.8.2
# Use --enable-maintainer-mode to disabled deprecated symbols
if test "x$enable_map" != "xno"; then
PKG_CHECK_MODULES(LIBCHAMPLAIN,
[
- champlain-0.2 >= $LIBCHAMPLAIN_REQUIRED,
- champlain-gtk-0.2 >= $LIBCHAMPLAIN_GTK_REQUIRED
+ champlain-0.3 >= $LIBCHAMPLAIN_REQUIRED,
+ champlain-gtk-0.3 >= $LIBCHAMPLAIN_GTK_REQUIRED
clutter-gtk-0.8 >= $CLUTTER_GTK_REQUIRED
], have_libchamplain="yes", have_libchamplain="no")
ClutterActor *marker;
ChamplainLayer *layer;
- information->map_view = champlain_view_new (CHAMPLAIN_VIEW_MODE_KINETIC);
+ information->map_view = champlain_view_new ();
information->map_view_embed = champlain_view_embed_new (
CHAMPLAIN_VIEW (information->map_view));
gtk_container_add (GTK_CONTAINER (information->viewport_map),
information->map_view_embed);
g_object_set (G_OBJECT (information->map_view), "show-license", FALSE,
+ "scroll-mode", CHAMPLAIN_SCROLL_MODE_KINETIC,
NULL);
layer = champlain_layer_new ();
champlain_view_add_layer (CHAMPLAIN_VIEW (information->map_view), layer);
- marker = champlain_marker_new_with_label (
+ marker = champlain_marker_new_with_text (
empathy_contact_get_name (information->contact), NULL, NULL, NULL);
- champlain_marker_set_position (CHAMPLAIN_MARKER (marker), lat, lon);
+ champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (marker), lat, lon);
clutter_container_add (CLUTTER_CONTAINER (layer), marker, NULL);
champlain_view_center_on (CHAMPLAIN_VIEW(information->map_view), lat, lon);
window->list_store = list_store;
/* Set up map view */
- window->map_view = CHAMPLAIN_VIEW (champlain_view_new (
- CHAMPLAIN_VIEW_MODE_KINETIC));
- g_object_set (G_OBJECT (window->map_view), "zoom-level", 1, NULL);
+ window->map_view = CHAMPLAIN_VIEW (champlain_view_new ());
+ g_object_set (G_OBJECT (window->map_view), "zoom-level", 1,
+ "scroll-mode", CHAMPLAIN_SCROLL_MODE_KINETIC, NULL);
champlain_view_center_on (window->map_view, 36, 0);
embed = champlain_view_embed_new (window->map_view);
gtk_widget_show_all (embed);
window->layer = champlain_layer_new ();
- champlain_view_add_layer (CHAMPLAIN_VIEW (window->map_view), window->layer);
+ champlain_view_add_layer (window->map_view, window->layer);
/* Set up contact list. */
model = GTK_TREE_MODEL (window->list_store);
lon = g_value_get_double (value);
clutter_actor_show (CLUTTER_ACTOR (marker));
- champlain_marker_set_position (marker, lat, lon);
+ champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (marker), lat, lon);
}
GValue *value;
GdkPixbuf *avatar;
guint handle_id;
+ const gchar *name;
gtk_tree_model_get (model, iter, EMPATHY_CONTACT_LIST_STORE_COL_CONTACT,
&contact, -1);
{
texture = clutter_texture_new ();
gtk_clutter_texture_set_from_pixbuf (CLUTTER_TEXTURE (texture), avatar);
- clutter_actor_set_position (CLUTTER_ACTOR (texture), 5, 5);
- clutter_container_add (CLUTTER_CONTAINER (marker), texture, NULL);
+ champlain_marker_set_image (CHAMPLAIN_MARKER (marker), texture);
}
+ else
+ champlain_marker_set_image (CHAMPLAIN_MARKER (marker), NULL);
+
+ name = empathy_contact_get_name (contact);
+ champlain_marker_set_text (CHAMPLAIN_MARKER (marker), name);
map_view_marker_update (CHAMPLAIN_MARKER (marker), contact);