GNOME.org
 

[gnome-internet-radio-locator] Add Fancy Colors

commit 33397d57e767f9eae55be767ba3e6c616d8f451c
Author: Ole Aamot <ole aamotsoftware com>
Date:   Fri May 24 23:11:22 2019 +0200

    Add Fancy Colors

 NEWS                                       |   8 +++
 compile                                    |   2 +-
 configure.ac                               |   2 +-
 gnome-internet-radio-locator.spec.in       |   3 +
 src/gnome-internet-radio-locator-markers.c | 102 +++++++++++++++--------------
 5 files changed, 67 insertions(+), 50 deletions(-)
---
diff --git a/NEWS b/NEWS
index 4d16f0e..6e897ed 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,11 @@
+=============
+Version 2.0.4
+=============
+
+GUI
+
+       * src/gnome-internet-radio-locator-markers.c: Fancy Colors
+
 =============
 Version 2.0.3
 =============
diff --git a/compile b/compile
index b89c278..99e5052 100755
--- a/compile
+++ b/compile
@@ -1,4 +1,4 @@
-#!/usr/bin/sh
+#! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
 scriptversion=2018-03-07.03; # UTC
diff --git a/configure.ac b/configure.ac
index ea23e64..d1a2600 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(gnome-internet-radio-locator,2.0.3)
+AC_INIT(gnome-internet-radio-locator,2.0.4)
 AM_INIT_AUTOMAKE([-Wno-portability 1.11 no-dist-gzip dist-xz tar-ustar subdir-objects])
 AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/gnome-internet-radio-locator.c])
diff --git a/gnome-internet-radio-locator.spec.in b/gnome-internet-radio-locator.spec.in
index 0cbbb0e..3a98878 100644
--- a/gnome-internet-radio-locator.spec.in
+++ b/gnome-internet-radio-locator.spec.in
@@ -57,6 +57,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Fri May 24 2019 Ole Aamot <ole gnome org> - 2.0.4-1
+- gnome-internet-radio-locator 2.0.4 build on Fedora Linux 30
+
 * Mon May 20 2019 Ole Aamot <ole gnome org> - 2.0.3-1
 - gnome-internet-radio-locator 2.0.3 build on Fedora Linux 30
 
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index 953ff08..3ac234d 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -111,6 +111,12 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        ClutterActor *marker;
        ClutterActor *layer_actor;
        ClutterColor city_color = { 0xf3, 0x94, 0x07, 0xbb };
+       ClutterColor city_a_color = { 0xed, 0xd4, 0x00, 0xbb };
+       ClutterColor city_b_color = { 0xf5, 0x79, 0x00, 0xbb };
+       ClutterColor city_c_color = { 0x73, 0xd2, 0x16, 0xbb };
+       ClutterColor city_d_color = { 0x34, 0x65, 0xa4, 0xbb };
+       ClutterColor city_e_color = { 0x75, 0x50, 0x7b, 0xbb };
+       ClutterColor city_f_color = { 0xcc, 0x00, 0x00, 0xbb };
        ClutterColor text_color = { 0xff, 0xff, 0xff, 0xff };
        LocationCallbackData callback_data;
        gchar *station = NULL;
@@ -130,7 +136,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        marker = champlain_label_new_with_text ("Norway\n<span size=\"small\">Oslo</span>", "Helvetica 14", 
NULL, NULL);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
        champlain_label_set_alignment (CHAMPLAIN_LABEL (marker), PANGO_ALIGN_RIGHT);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker),  37.873093, -122.303769);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -140,7 +146,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Ayr, Scotland\n<span size=\"small\">UWS Radio</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 55.4594119, -4.6326702);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -151,7 +157,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Bergen, Norway\n<span size=\"small\">SRIB</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 60.3943034, 5.3258117);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -162,7 +168,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Berkeley, California\n<span size=\"small\">KALX</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.873093, -122.303769);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -173,7 +179,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("WBUR, Boston, Massachusetts\n<span size=\"small\">WBUR</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 42.3516603, -71.1226348);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -184,7 +190,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("WTBU, Boston, Massachusetts\n<span size=\"small\">WTBU</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 42.3602534, -71.0582912);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -195,7 +201,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Bruxelles, Belgium\n<span size=\"small\">Radio Campus</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 50.84404145, 4.36720169448285);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -206,7 +212,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Calgary, Canada\n<span size=\"small\">CJSW</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 51.0534234, -114.0625892);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -217,7 +223,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("WHRB-FM, Cambridge, Massachusetts\n<span size=\"small\">WHRB</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 42.3723191, -71.1186638);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -228,7 +234,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("WMBR-FM, Cambridge, Massachusetts\n<span size=\"small\">WMBR</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 42.3617430, -71.0839082);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -239,7 +245,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Cambridge, United Kingdom\n<span size=\"small\">Cam FM</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 52.2033051, 0.124862);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -250,7 +256,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Cape Town, South Africa\n<span size=\"small\">UCT Radio</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), -33.928992, 18.417396);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -261,7 +267,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Copenhagen, Denmark\n<span size=\"small\">Danmarks Radio Nyheder</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 55.6867243, 12.5700724);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -272,7 +278,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Chicago, Illinois\n<span size=\"small\">WHPK</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 41.8755546, -87.6244212);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -283,7 +289,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Dublin, Ireland\n<span size=\"small\">DCUfm</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 53.3497645, -6.2602732);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -293,7 +299,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Guatemala City, Guatemala\n<span size=\"small\">Radio Universidad</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 14.6417889, -90.5132239);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -304,7 +310,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Honolulu, Hawaii\n<span size=\"small\">Hawaii Public Radio</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 21.304547, -157.8556764);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -315,7 +321,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Kingston, Canada\n<span size=\"small\">CFRC</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 44.230687, -76.481323);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -326,7 +332,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Kristiansand, Norway\n<span size=\"small\">NRK Sørlandet</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 58.14615, 7.9957333);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -337,7 +343,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Houston, Texas\n<span size=\"small\">Coog Radio, University of Houston</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 29.7589382, -95.3676974);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -348,7 +354,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("London, United Kingdom\n<span size=\"small\">Imperial College Radio</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 51.5073219, -0.1276474);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -359,7 +365,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Los Angeles, California\n<span size=\"small\">KXSC</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 34.1430079, -118.14176172581);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -370,7 +376,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("México City, México\n<span size=\"small\">Radio UNAM</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 19.647012, -101.22900565);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -381,7 +387,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Moscow, Russia\n<span size=\"small\">Echo of Moscow</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 55.4792046, 37.3273304);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -392,7 +398,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Newcastle, Australia\n<span size=\"small\">2NURFM</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), -32.9272881, 151.7812534);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -403,7 +409,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("New Orleans, Louisiana\n<span size=\"small\">WWNO</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 29.9499323, -90.0701156);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -414,7 +420,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("New York City, New York\n<span size=\"small\">WKCR</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 40.7306458, -73.9866136);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -425,7 +431,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Oslo, Norway\n<span size=\"small\">NRK Sport</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 59.9132694, 10.7391112);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -436,7 +442,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Oxford, United Kingdom\n<span size=\"small\">Oxide Radio</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 51.7520131, -1.2578499);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -447,7 +453,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Ottawa, Canada\n<span size=\"small\">CHUO</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 45.421106, -75.690308);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -458,7 +464,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Paris, France\n<span size=\"small\">Radio Campus Paris</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 48.8566101, 2.3514992);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -469,7 +475,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Phoenix, Arizona\n<span size=\"small\">KASC</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 33.4485866, -112.0773456);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -480,7 +486,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Pisa, Italy\n<span size=\"small\">Radio Eco</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 43.7159395, 10.4018624);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -491,7 +497,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("San Francisco, California\n<span size=\"small\">SomaFM</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.7792808, -122.4192363);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -502,7 +508,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Seattle, Washington\n<span size=\"small\">KSUB</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 47.6038321, -122.3300624);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -513,7 +519,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Stanford, California\n<span size=\"small\">KZSU</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.4248398, -122.1677058);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -524,7 +530,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Stockholm, Sweden\n<span size=\"small\">Sveriges Radio P1</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 59.3251172, 18.0710935);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -535,7 +541,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Sydney, Canada\n<span size=\"small\">Caper Radio</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 46.1654766, -60.1735637935906);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -546,7 +552,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Tampere, Finland\n<span size=\"small\">Radio Moreeni</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 61.4980214, 23.7603118);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -557,7 +563,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Toronto, Canada\n<span size=\"small\">CIUT</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 43.653963, -79.387207);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -568,7 +574,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Tórshavn, Faroe Islands\n<span size=\"small\">Midlar</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 62.012, -6.768);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -579,7 +585,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Trondheim, Norway\n<span size=\"small\">Radio Revolt</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 63.4305658, 10.3951929);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -590,7 +596,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Warsaw, Poland\n<span size=\"small\">Radio Aktywne</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_a_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 52.2319237, 21.0067265);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -601,7 +607,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Washington, District of Columbia\n<span size=\"small\">WAMU</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_b_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 38.8949549, -77.0366456);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -612,7 +618,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        station = g_strdup("Waterloo, Canada\n<span size=\"small\">SoundFM</span>");
        champlain_label_set_text (CHAMPLAIN_LABEL (marker), station);
        champlain_label_set_use_markup (CHAMPLAIN_LABEL (marker), TRUE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_c_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 43.466874, -80.524635);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -621,20 +627,20 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
 #if 0
        marker = champlain_label_new_from_file ("icons/emblem-important.png", NULL);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_d_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.873093, -122.303769);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
        champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker));
        marker = champlain_point_new ();
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_e_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.873093, -122.303769);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
        champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker));
        marker = champlain_label_new_from_file ("icons/emblem-favorite.png", NULL);
        champlain_label_set_draw_background (CHAMPLAIN_LABEL (marker), FALSE);
-       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_color);
+       champlain_label_set_color (CHAMPLAIN_LABEL (marker), &city_f_color);
        champlain_label_set_text_color (CHAMPLAIN_LABEL (marker), &text_color);
        champlain_location_set_location (CHAMPLAIN_LOCATION (marker), 37.873093, -122.303769);
        champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]