[gnome-internet-radio-locator] GNOME Internet Radio Locator version 3.6.0

[Ole Aamot <ole src gnome org>]

commit 07013df5fffac634e23e5ac3a3f417e5fe78b5ac
Author: Ole Aamot <ole@aamot.software>
Date:   Sun Oct 18 21:24:42 2020 +0200

    GNOME Internet Radio Locator version 3.6.0

 NEWS                                       |  6 +++++-
 configure.ac                               |  2 +-
 meson.build                                |  5 +++--
 po/meson.build                             |  1 -
 src/gnome-internet-radio-locator-markers.c | 13 ++++++++++++-
 src/gnome-internet-radio-locator.xml       |  4 ++--
 6 files changed, 23 insertions(+), 8 deletions(-)
---
diff --git a/NEWS b/NEWS
index 0974d2e..5885d74 100644
--- a/NEWS
+++ b/NEWS
@@ -2,9 +2,13 @@
 Version 3.6.0
 =============
 
+Build
+       * meson.build: Add "subdir('po')" Meson directive (Close: Issue #24)
+
 Stations
 
-       * src/gnome-internet-radio-locator.xml: Add KUOW (Seattle, Washington)
+       * src/gnome-internet-radio-locator-markers.c: University of Washington
+       * src/gnome-internet-radio-locator.xml: Add KUOW (Univ. of Washington)
 
 =============
 Version 3.5.0
diff --git a/configure.ac b/configure.ac
index 7dee58b..318576e 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,3.5.0)
+AC_INIT(gnome-internet-radio-locator,3.6.0)
 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/meson.build b/meson.build
index db83b1c..64ba7ab 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('gnome-internet-radio-locator', 'c',
-  version : '3.5.0',
+  version : '3.6.0',
   meson_version: '>= 0.49.2',
   license : 'GPL')
 prefix = get_option('prefix')
@@ -24,9 +24,10 @@ configure_file(output: 'config.h', configuration: config_h)
 m_dep = cc.find_library('m', required : false)
 inc = include_directories('src')
 subdir('src')
+subdir('po')
 pkg_mod = import('pkgconfig')
 pkg_mod.generate(libraries : gnomeinternetradiolibrary,
-                 version : '3.5.0',
+                 version : '3.6.0',
                  name : 'libgnomeinternetradiolibrary',
                  filebase : 'gnomeinternetradiolibrary',
                  description : 'GNOME Internet Radio Library')
diff --git a/po/meson.build b/po/meson.build
index 762ed35..03d006d 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,6 +1,5 @@
 i18n = import('i18n')
 # define GETTEXT_PACKAGE
-add_project_arguments('-DGETTEXT_PACKAGE="gnome-internet-radio-locator"', language:'c')
 i18n.gettext(meson.project_name(),
     args: '--directory=' + meson.source_root()
 )
\ No newline at end of file
diff --git a/src/gnome-internet-radio-locator-markers.c b/src/gnome-internet-radio-locator-markers.c
index 5f17f78..fa3bdec 100644
--- a/src/gnome-internet-radio-locator-markers.c
+++ b/src/gnome-internet-radio-locator-markers.c
@@ -2,7 +2,7 @@
  *
  * GNOME Internet Radio Locator
  *
- * Copyright (C) 2019  Aamot Software
+ * Copyright (C) 2019, 2020  Aamot Software
  *
  * Author: Ole Aamot <ole gnome org>
  *
@@ -737,6 +737,17 @@ 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("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_f_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));
+       champlain_marker_animate_in(CHAMPLAIN_MARKER (marker));
+       /* 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("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);
diff --git a/src/gnome-internet-radio-locator.xml b/src/gnome-internet-radio-locator.xml
index ad01942..48a4658 100644
--- a/src/gnome-internet-radio-locator.xml
+++ b/src/gnome-internet-radio-locator.xml
@@ -1,9 +1,9 @@
 <?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-0.1.dtd">
-<gnome_internet_radio_locator version="3.5.0">
+<gnome_internet_radio_locator version="3.6.0">
   <station band="94.9FM" id="kuow" lang="en" name="KUOW" rank="1.0" type="org">
-    <location>Seattle, Washington</location>
+    <location>University of Washington</location>
     <description lang="en">KUOW is the Puget Sound region's #1 radio station for news.  Our independent, 
nonprofit newsroom produces award-winning stories, podcasts and events.</description>
     <stream mime="audio/aac" 
uri="https://playerservices.streamtheworld.com/api/livestream-redirect/KUOWFM_AAC.aac"; codec="MPEG-4 AAC" 
samplerate="48000 Hz" bitrate="64 kbps" />
     <uri>https://www.kuow.org/</uri>