[gnome-internet-radio-locator] Update marker code

[Ole Aamot <ole src gnome org>]

commit d1fdda2c37e7df0581c7e2d22d729f59fe94e014
Author: Ole Aamot <ole gnome org>
Date:   Sun Feb 3 21:42:06 2019 +0100

    Update marker code

 src/gnome-internet-radio-locator-gui.c     | 12 ++++++------
 src/gnome-internet-radio-locator-markers.c |  6 +++---
 src/gnome-internet-radio-locator.xml       | 14 ++++++--------
 3 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/src/gnome-internet-radio-locator-gui.c b/src/gnome-internet-radio-locator-gui.c
index 2b6f5af..2d498e6 100644
--- a/src/gnome-internet-radio-locator-gui.c
+++ b/src/gnome-internet-radio-locator-gui.c
@@ -313,18 +313,18 @@ GtkWidget *create_new_station_selector(gchar *location) {
        }
        stationinfo = gnome_internet_radio_locator_station_load_from_file(localstation,
                                                                          world_station_xml_filename);
-       gtk_widget_show(nameentry);
-       gtk_widget_show(locationentry);
-       gtk_widget_show(urientry);
-       gtk_widget_show(bandentry);
-       gtk_widget_show(descriptionentry);
-       gtk_widget_show(websiteentry);
        gtk_container_add(GTK_CONTAINER(content_area), nameentry);
        gtk_container_add(GTK_CONTAINER(content_area), bandentry);
        gtk_container_add(GTK_CONTAINER(content_area), locationentry);
        gtk_container_add(GTK_CONTAINER(content_area), urientry);
        gtk_container_add(GTK_CONTAINER(content_area), descriptionentry);
        gtk_container_add(GTK_CONTAINER(content_area), websiteentry);
+       gtk_widget_show(nameentry);
+       gtk_widget_show(bandentry);
+       gtk_widget_show(locationentry);
+       gtk_widget_show(urientry);
+       gtk_widget_show(descriptionentry);
+       gtk_widget_show(websiteentry);
        /* g_signal_connect(G_OBJECT(station_selector), GTK_RESPONSE_ACCEPT, */
        /*               G_CALLBACK(on_new_station_selector_changed), */
        /*               NULL); */
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index 11dc540..85b7c8b 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -170,7 +170,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
        g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
        marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
-       station = g_strdup("Boston, Massachusetts\n<span size=\"small\">http://www.wtburadio.org/</span>");
+       station = g_strdup("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);
@@ -203,7 +203,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
        g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
        marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
-       station = g_strdup("WHRB-FM, Cambridge, Massachusetts\n<span 
size=\"small\">http://www.whrb.org/</span>");
+       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);
@@ -214,7 +214,7 @@ create_marker_layer (G_GNUC_UNUSED ChamplainView *view, ChamplainPathLayer **pat
        /* champlain_path_layer_add_node (*path, CHAMPLAIN_LOCATION (marker)); */
        g_signal_connect(CHAMPLAIN_LOCATION(marker), "button-press", G_CALLBACK(marker_function), station);
        marker = champlain_label_new_from_file ("icons/emblem-generic.png", NULL);
-       station = g_strdup("WMBR-FM, Cambridge, Massachusetts\n<span 
size=\"small\">http://www.wmbr.org/</span>");
+       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);
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index 6425a5f..0f6896c 100644
--- a/src/gnome-internet-radio-locator.xml
+++ b/src/gnome-internet-radio-locator.xml
@@ -631,14 +631,6 @@ WUMR has been the University of Memphis broadcasting outlet since 1979, when Sou
     <stream mime="audio/mpeg" uri="http://audio.wpts.pitt.edu:8000/wpts_live_96s.mp3"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
     <stream mime="audio/mpeg" uri="http://audio.wpts.pitt.edu:8000/wpts_live_48s.mp3"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="48 kbps" />
   </station>
-  <station band="1330AM" id="wtbu" lang="en" name="WTBU" rank="1.0" type="edu">
-    <frequency uri="http://www.wtburadio.org/";>89.3 FM in Boston, Massachusetts</frequency>
-    <location>Boston, Massachusetts</location>
-    <description lang="en">
-      WTBU is BU's student-run, volunteer radio station which broadcasts live 20 hours a day.  Our station 
is primarily available through our webcast, but you can also listen to us on 89.3 FM/640 AM if you're in 
Boston, or on BU's cable channel 6 if you live on campus.
-    </description>
-    <stream mime="audio/mpeg" uri="http://wtbu.bu.edu:1800/listen"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="191 kbps" />
-  </station>
   <station band="1330AM" id="kasc" lang="en" name="Arizona State University" rank="1.0" type="edu">
     <frequency uri="http://www.blazeradioonline.com/";>1330 AM in Phoenix, Arizona</frequency>
     <location>Phoenix, Arizona</location>
@@ -1005,6 +997,12 @@ Behind the scenes we rely on our fantastic technical, musical and promotional te
     <stream mime="audio/mpeg" uri="http://icecast.media.berkeley.edu:8000/kalx-128.mp3"; codec="MPEG 1 Audio, 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
     <uri>http://kalx.berkeley.edu/</uri>
   </station>
+  <station band="1330AM" id="wtbu" lang="en" name="WTBU" rank="1.0" type="edu">
+    <frequency uri="http://www.wtburadio.org/";>89.3 FM in Boston, Massachusetts</frequency>
+    <location>Boston, Massachusetts</location>
+    <description lang="en">WTBU is BU's student-run, volunteer radio station which broadcasts live 20 hours 
a day.  Our station is primarily available through our webcast, but you can also listen to us on 89.3 FM/640 
AM if you're in Boston, or on BU's cable channel 6 if you live on campus.</description>
+    <stream mime="audio/mpeg" uri="http://wtbu.bu.edu:1800/listen"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="191 kbps" />
+  </station>
   <station band="95.3FM" id="whrb" lang="en" name="WHRB" rank="1.0" type="edu">
     <frequency uri="http://www.whrb.org/";>95.3 FM in Cambridge, Massachusetts</frequency>
     <location>WHRB-FM, Cambridge, Massachusetts</location>