[gnome-internet-radio-locator] Add Dingzhong Chen (Chinese translation)
- From: Ole Aamot <ole src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-internet-radio-locator] Add Dingzhong Chen (Chinese translation)
- Date: Fri, 30 Apr 2021 14:39:38 +0000 (UTC)
commit d9ba63c6bc70167e899371bc43085a102bbcf8b5
Author: Ole Aamot <ole gnome org>
Date: Fri Apr 30 16:38:41 2021 +0200
Add Dingzhong Chen (Chinese translation)
AUTHORS | 3 +-
THANKS | 3 +-
configure.ac | 2 +-
src/gnome-internet-radio-locator-markers.c | 146 ++++++++++++++---------------
src/gnome-internet-radio-locator.xml | 2 +-
5 files changed, 79 insertions(+), 77 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index e002303..3621ec6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -32,4 +32,5 @@ Yuri Chornoivan (Ukrainian translation)
Andre Klapper (Documentation)
Dušan Kazik (Slovak translation)
Efstathios Iosifidis (Greek translation)
-Muhammet Kara (Turkish translation)
\ No newline at end of file
+Muhammet Kara (Turkish translation)
+Dingzhong Chen (Chinese translation)
diff --git a/THANKS b/THANKS
index 0ca5d01..05b10b3 100644
--- a/THANKS
+++ b/THANKS
@@ -38,4 +38,5 @@ Andre Klapper (Documentation)
Dušan Kazik (Slovak translation)
Tomasz Kłoczko (Meson Build bug)
Efstathios Iosifidis (Greek translation)
-Muhammet Kara (Turkish translation)
\ No newline at end of file
+Muhammet Kara (Turkish translation)
+Dingzhong Chen (Chinese translation)
diff --git a/configure.ac b/configure.ac
index 1764419..2a880e6 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,4.0.1)
+AC_INIT(gnome-internet-radio-locator,4.0.2)
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/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index bf69466..a37d596 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -246,7 +246,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Bern, Switzerland\n<span size=\"small\">Radio NRJ Bern</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_f_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), 46.9482713, 7.4514512);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -257,7 +257,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_a_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.3516603, -71.1226348);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -268,7 +268,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_b_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), 42.3602534, -71.0582912);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -279,7 +279,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Brno, Czech Republic\n<span size=\"small\">Radio R</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_c_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), 49.1922443, 16.6113382);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -290,7 +290,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Bronx, New York\n<span size=\"small\">WFUV</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_d_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.8466508, -73.8785937);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -301,7 +301,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Brooklyn, New York\n<span size=\"small\">Radio Free Brooklyn</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_e_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), 40.8466508, -73.8785937);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -312,7 +312,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_f_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), 50.84404145, 4.36720169448285);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -323,7 +323,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Budapest, Hungary\n<span size=\"small\">EPER</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_a_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), 47.4983815, 19.0404707);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -334,7 +334,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Buenos Aires, Argentina\n<span size=\"small\">BlurFM</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_b_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), -34.6075682, -58.4370894);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -345,7 +345,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Buskerud, Norway\n<span size=\"small\">NRK P1 Buskerud</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_c_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), 60.2497876, 8.96278676790604);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -356,7 +356,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_d_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.0534234, -114.0625892);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -367,7 +367,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_e_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.3723191, -71.1186638);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -378,7 +378,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_f_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.3617430, -71.0839082);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -389,7 +389,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_a_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), 52.2033051, 0.124862);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -400,7 +400,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_b_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), -33.928992, 18.417396);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -411,7 +411,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_c_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.6867243, 12.5700724);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -422,7 +422,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_d_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), 41.8755546, -87.6244212);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -435,7 +435,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Dubai, Saudi Arabia\n<span size=\"small\">Middle East Broadcasting Center
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_e_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), 21.4146056, 39.8227432);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -445,7 +445,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_f_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), 53.3497645, -6.2602732);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -455,7 +455,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Finnmark, Norway\n<span size=\"small\">NRK P1 Finnmark</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_a_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), 69.86993469999999, 21.827278548625912);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -466,7 +466,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_b_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));
@@ -477,7 +477,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_c_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), 21.304547, -157.8556764);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -488,7 +488,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Hordaland, Norway\n<span size=\"small\">NRK P1 Hordaland</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_d_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.2570766, 6.06249778348651);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -499,7 +499,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Kárášjohka, Norway\n<span size=\"small\">NRK Sápmi</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_e_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), 68.7718259, 24.2803624);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -510,7 +510,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_f_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), 44.230687, -76.481323);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -521,7 +521,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_a_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), 58.14615, 7.9957333);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -532,7 +532,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_b_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), 29.7589382, -95.3676974);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -543,7 +543,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Innlandet, Norway\n<span size=\"small\">NRK P1 Innlandet</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_c_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), 61.26810555, 10.485458802304304);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -554,7 +554,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_d_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));
@@ -565,7 +565,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_e_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));
@@ -576,7 +576,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Lyon, France\n<span size=\"small\">Radio Brume</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_f_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), 45.7544734, 4.8122242);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -587,7 +587,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_a_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), 19.647012, -101.22900565);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -598,7 +598,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_b_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.4792046, 37.3273304);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -609,7 +609,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Møre og Romsdal, Norway\n<span size=\"small\">NRK P1 Møre og Romsdal</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_c_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), 62.8452777, 7.51819407263736);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -620,7 +620,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_d_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), -32.9272881, 151.7812534);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -631,7 +631,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_e_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), 29.9499323, -90.0701156);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -642,7 +642,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_f_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), 40.7306458, -73.9866136);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -653,7 +653,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Nordkapp, Norway\n<span size=\"small\">Radio Nordkapp</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_a_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), 71.1699506, 25.7858893);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -664,7 +664,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Nordland, Norway\n<span size=\"small\">NRK P1 Nordland</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_b_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), 67.27564050000001, 13.862360639913621);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -675,7 +675,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Norway\n<span size=\"small\">Radio Norwegian</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_c_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), 60.133054099999995, 7.531103018917516);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -686,7 +686,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Ontario, Canada\n<span size=\"small\">RadioWaterloo</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_d_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));
@@ -697,7 +697,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_e_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));
@@ -708,7 +708,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_f_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));
@@ -719,7 +719,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_a_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));
@@ -730,7 +730,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_b_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));
@@ -741,7 +741,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_c_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));
@@ -752,7 +752,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_d_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));
@@ -763,7 +763,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Porsgrunn, Norway\n<span size=\"small\">NRK Telemark</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_e_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.140759, 9.6562495);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -774,7 +774,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Portland, Oregon\n<span size=\"small\">KPSU</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_f_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), 45.5202471,-122.6741949);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -785,7 +785,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Rogaland, Norway\n<span size=\"small\">NRK P1 Rogaland</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_a_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), 58.93631375, 5.80587864304024);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -796,7 +796,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_b_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.7792808, -122.4192363);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -807,7 +807,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_c_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), 47.6038321, -122.3300624);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -818,7 +818,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("University of Washington\n<span size=\"small\">KUOW</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_d_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), 47.6543238,-122.30800894320257);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -829,7 +829,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Sogn og Fjordane, Norway\n<span size=\"small\">NRK P1 Sogn og Fjordane</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_e_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), 61.53093745, 6.10242908066871);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -840,7 +840,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_f_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.4248398, -122.1677058);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -851,7 +851,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_a_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), 59.3251172, 18.0710935);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -862,7 +862,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_b_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), 46.1654766, -60.1735637935906);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -873,7 +873,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_c_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), 61.4980214, 23.7603118);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -884,7 +884,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Thessaloniki, Greece\n<span size=\"small\">1431 AM</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_d_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.6403167, 22.9352716);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -895,7 +895,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_e_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));
@@ -906,7 +906,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_f_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));
@@ -917,7 +917,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Tønsberg, Norway\n<span size=\"small\">NRK Vestfold</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_a_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), 59.3549795, 10.282049110877239);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -928,7 +928,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Troms, Norway\n<span size=\"small\">NRK P1 Troms</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_b_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), 64.5731537, 11.52803643954819);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -939,7 +939,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_c_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), 63.4305658, 10.3951929);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -950,7 +950,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Trøndelag, Norway\n<span size=\"small\">NRK P1 Trøndelag</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_d_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), 63.87759235, 10.195050547141093);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -961,7 +961,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Volda, Norway\n<span size=\"small\">Bygderadio Vest</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_e_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), 62.08037975, 6.274410767523168);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -972,7 +972,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_f_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.2319237, 21.0067265);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -983,7 +983,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_a_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), 38.8949549, -77.0366456);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -994,7 +994,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Supreme Court, United States of America\n<span size=\"small\">C-SPAN</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_b_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), 38.889741, -77.003441);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -1005,7 +1005,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Østfold, Norway\n<span size=\"small\">NRK P1 Østfold</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_c_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), 59.20313315, 10.9535037948529);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -1016,7 +1016,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
station = g_strdup("Ålesund, Norway\n<span size=\"small\">Radio Ålesund</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_d_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), 62.76712545, 6.168828066313526);
champlain_marker_layer_add_marker (layer, CHAMPLAIN_MARKER (marker));
@@ -1025,13 +1025,13 @@ 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_e_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_f_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));
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index 53bebb5..4b3341d 100644
--- a/src/gnome-internet-radio-locator.xml
+++ b/src/gnome-internet-radio-locator.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml-stylesheet type="text/xsl"
href="https://people.gnome.org/~ole/gnome-internet-radio-locator/gnome-internet-radio-locator.xsl"; ?>
<!DOCTYPE gnome_internet_radio_locator SYSTEM "gnome-internet-radio-locator-4.0.dtd">
-<gnome_internet_radio_locator version="4.0.1">
+<gnome_internet_radio_locator version="4.0.2">
<station band="105.5FM" id="bygderadiovest" lang="en" name="Bygderadio Vest" rank="1.0" type="org">
<location>Volda, Norway</location>
<description lang="no">Volda og Ørsta Bygderadio AS starta sendingar i februar 1989. I starten dekte
radioen berre bygdene Volda og Ørsta. I 2000 vart radioen slått saman med Radio Vest AS i Herøy. Namnet
vart då endra til Bygderadio Vest AS. Alt arbeidet ved radioen vert gjort på dugnad. Bygderadio Vest AS
dekkjer no 7 kommuner; Volda, Ørsta, Hareid, Herøy, Ulstein, Sande og Vannylven. Det bur omlag 46.700
menneske i desse kommunane. Frå 2008 har Bygderadio Vest AS konsesjon som almennradio med konsesjon for å
sende 240 minutt lokalprodusert stoff i tidsrommet 06-18. Konsesjonen gjeld fram til 31.12.2026.</description>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
