Have the demo use the new markers

diff --git a/demos/launcher.c b/demos/launcher.c
index b505168195cf0ca57960e3976ad708dfbffffc0f..0e01e09fa58736c35f43be97882b90cb04b25479 100644 (file)
--- a/demos/launcher.c
+++ b/demos/launcher.c
@@ -84,13 +84,15 @@ create_marker_layer (ChamplainView *view)
 {
   ClutterActor *marker;
   ChamplainLayer *layer;
-  ClutterColor orange = { 0xf3, 0x94, 0x07, 0xbb };
-  ClutterColor white = { 0xff, 0xff, 0xff, 0xff };
+  //ClutterColor orange = { 0xf3, 0x94, 0x07, 0xbb };
+  //ClutterColor white = { 0xff, 0xff, 0xff, 0xff };
 
   layer = champlain_layer_new ();
 
-  marker = champlain_marker_new_with_text ("Montréal", "Airmole 14", NULL,
-      NULL);
+  marker = champlain_marker_new_with_text ("Montréal\n<span size=\"xx-small\">Québec</span>",
+      "Airmole 14", NULL, NULL);
+  champlain_marker_set_use_markup (CHAMPLAIN_MARKER (marker), TRUE);
+
   markers[0] = CHAMPLAIN_BASE_MARKER (marker);
   champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (marker),
       45.528178, -73.563788);
@@ -99,14 +101,12 @@ create_marker_layer (ChamplainView *view)
   g_signal_connect_after (marker, "button-release-event",
       G_CALLBACK (marker_button_release_cb), view);
 
-  marker = champlain_marker_new_with_text ("New York", "Sans 25", &white,
-      NULL);
+  marker = champlain_marker_new_full ("New York", "/usr/share/icons/Tangerine/24x24/actions/stock_home.png", NULL);
   markers[1] = CHAMPLAIN_BASE_MARKER (marker);
   champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (marker), 40.77, -73.98);
   clutter_container_add (CLUTTER_CONTAINER (layer), marker, NULL);
 
-  marker = champlain_marker_new_with_text ("Saint-Tite-des-Caps", "Serif 12",
-      NULL, &orange);
+  marker = champlain_marker_new_with_image ("/usr/share/icons/Tangerine/24x24/actions/stock_home.png", NULL);
   markers[2] = CHAMPLAIN_BASE_MARKER (marker);
   champlain_base_marker_set_position (CHAMPLAIN_BASE_MARKER (marker), 47.130885,
       -70.764141);