[girl] GNOME Internet Radio Locator 9.3.0

From: Ole Aamot <ole src gnome org>
To: commits-list gnome org
Cc:
Subject: [girl] GNOME Internet Radio Locator 9.3.0
Date: Sat, 25 Jun 2016 19:10:17 +0000 (UTC)
commit 211c5bf4152d4f9aaa0495711cf7777efa745dbd
Author: Ole Aamot <oka oka no>
Date:   Sat Jun 25 21:06:40 2016 +0200

    GNOME Internet Radio Locator 9.3.0

 NEWS               |   13 +++++++++++++
 configure          |   20 ++++++++++----------
 configure.ac       |    2 +-
 debian/Makefile.am |    2 +-
 debian/changelog   |   12 ++++++++++++
 debian/menu        |    4 ----
 girl.spec.in       |    3 +++
 src/Makefile.am    |    4 ++--
 src/Makefile.in    |    4 ++--
 src/girl-9.2.dtd   |   23 -----------------------
 src/girl.c         |   30 ++++++++++--------------------
 src/girl.xml       |   22 ++++++++++++++++++++--
 12 files changed, 74 insertions(+), 65 deletions(-)
---
diff --git a/NEWS b/NEWS
index 892b390..e66c81b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,17 @@
 =============
+Version 9.3.0
+=============
+
+GUI
+
+       * src/girl-station.c: Major overhaul of "New Station" functionality
+
+Stations
+
+       * src/girl.xml: Add URadio (Nicosia, Cyprus)
+       * src/girl.xml: Add Urgent.fm (Gent, Belgium)
+
+=============
 Version 9.2.0
 =============
 
diff --git a/configure b/configure
index c717728..1e28d1b 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for girl 9.2.0.
+# Generated by GNU Autoconf 2.69 for girl 9.3.0.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='girl'
 PACKAGE_TARNAME='girl'
-PACKAGE_VERSION='9.2.0'
-PACKAGE_STRING='girl 9.2.0'
+PACKAGE_VERSION='9.3.0'
+PACKAGE_STRING='girl 9.3.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1364,7 +1364,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures girl 9.2.0 to adapt to many kinds of systems.
+\`configure' configures girl 9.3.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1430,7 +1430,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 9.2.0:";;
+     short | recursive ) echo "Configuration of girl 9.3.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1545,7 +1545,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 9.2.0
+girl configure 9.3.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1910,7 +1910,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by girl $as_me 9.2.0, which was
+It was created by girl $as_me 9.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2773,7 +2773,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='9.2.0'
+ VERSION='9.3.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7457,7 +7457,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by girl $as_me 9.2.0, which was
+This file was extended by girl $as_me 9.3.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7523,7 +7523,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-girl config.status 9.2.0
+girl config.status 9.3.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 073a6ea..82eca6e 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(girl, 9.2.0)
+AC_INIT(girl, 9.3.0)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/debian/Makefile.am b/debian/Makefile.am
index f72660b..bd58623 100644
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = source
-EXTRA_DIST = changelog compat control control.in copyright girl.1 girl.install girl.manpages girl.xpm menu 
rules watch
+EXTRA_DIST = changelog compat control control.in copyright girl.1 girl.install girl.manpages girl.xpm rules 
watch
diff --git a/debian/changelog b/debian/changelog
index c13abfd..5d5388e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+girl (9.2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release 9.2.0.
+
+ -- Ole Aamot <ole src gnome org>  Tue, 21 Jun 2016 07:24:34 +0100
+
+girl (9.1.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release 9.1.0.
+
+ -- Petter Reinholdtsen <pere hungry com>  Wed, 08 Jun 2016 09:31:43 +0200
+
 girl (8.4.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/girl.spec.in b/girl.spec.in
index b502830..e8b2ad8 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -70,6 +70,9 @@ fi
 %{_datadir}/help/*/%{name}
 
 %changelog
+* Sat Jun 25 2016 Ole Aamot - 9.3.0-1.fc23
+- Girl 9.3.0 build on Fedora Linux 23
+
 * Sat Jun 11 2016 Ole Aamot - 9.2.0-1.fc23
 - Girl 9.2.0 build on Fedora Linux 23
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 3fb8505..75a52b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,9 +44,9 @@ girl_CFLAGS  = $(GIRL_CFLAGS) \
 girl_LDADD = $(GIRL_LIBS)
 
 girldir = $(datadir)/girl
-girl_DATA = girl-9.2.dtd girl-logo.png girl.png girl.xml
+girl_DATA = girl-9.3.dtd girl-logo.png girl.png girl.xml
 
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-program.h 
girl-runners.h girl-streams.h girl-9.2.dtd girl-map.png girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-program.h 
girl-runners.h girl-streams.h girl-9.3.dtd girl-map.png girl-logo.png girl.png girl.xml
 
 all-local: check-local
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 6588340..b44859f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -400,8 +400,8 @@ girl_CFLAGS = $(GIRL_CFLAGS) \
 
 girl_LDADD = $(GIRL_LIBS)
 girldir = $(datadir)/girl
-girl_DATA = girl-9.2.dtd girl-logo.png girl.png girl.xml
-EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-program.h 
girl-runners.h girl-streams.h girl-9.2.dtd girl-map.png girl-logo.png girl.png girl.xml
+girl_DATA = girl-9.3.dtd girl-logo.png girl.png girl.xml
+EXTRA_DIST = girl.h girl-station.h girl-stations-map.h girl-tz.h girl-gui.h girl-listener.h girl-program.h 
girl-runners.h girl-streams.h girl-9.3.dtd girl-map.png girl-logo.png girl.png girl.xml
 all: all-am
 
 .SUFFIXES:
diff --git a/src/girl.c b/src/girl.c
index 7155de7..2657a5e 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -279,30 +279,20 @@ void on_new_station_clicked(GtkWidget *a,
 
                g_print ("Squeak!\n\n");
 
-               girl->selected_station_uri =
-                       g_strdup(g_object_get_data(G_OBJECT(station), "station_uri"));
+               girl->selected_station_uri = g_strdup(g_object_get_data(G_OBJECT(station), "station_uri"));
                GIRL_DEBUG_MSG("on_new_station_select_changed: %s\n", girl->selected_station_uri);
-               girl->selected_station_description =
-                       g_strdup(g_object_get_data(G_OBJECT(station), "station_description"));
+               girl->selected_station_description = g_strdup(g_object_get_data(G_OBJECT(station), 
"station_description"));
                GIRL_DEBUG_MSG("on_new_station_select_changed: %s\n", girl->selected_station_description);
-
-                               girl->selected_station_band =
-                       g_strdup(g_object_get_data(G_OBJECT(station), "station_band"));
+               girl->selected_station_band = g_strdup(g_object_get_data(G_OBJECT(station), "station_band"));
                GIRL_DEBUG_MSG("on_new_station_select_changed: %s\n", girl->selected_station_band);
-
-                               girl->selected_station_website =
-                       g_strdup(g_object_get_data(G_OBJECT(station), "station_website"));
+               girl->selected_station_website = g_strdup(g_object_get_data(G_OBJECT(station), 
"station_website"));
                GIRL_DEBUG_MSG("on_new_station_select_changed: %s\n", girl->selected_station_website);
-               girl->selected_station_name =
-                       g_strdup(g_object_get_data(G_OBJECT(station), "station_name"));
+               girl->selected_station_name = g_strdup(g_object_get_data(G_OBJECT(station), "station_name"));
                GIRL_DEBUG_MSG("on_new_station_select_changed: %s\n",
                               girl->selected_station_name);
-
-               girl->selected_station_location =
-                       g_strdup(g_object_get_data(G_OBJECT(station), "station_location"));
+               girl->selected_station_location = g_strdup(g_object_get_data(G_OBJECT(station), 
"station_location"));
                GIRL_DEBUG_MSG("on_new_station_select_changed: %s\n",
                               girl->selected_station_location);
-
                girl_station_update (stationinfo, girl->selected_station_band, 
girl->selected_station_description, girl->selected_station_name, girl->selected_station_location, 
girl->selected_station_uri, girl->selected_station_website);
                break;
        default:
@@ -429,8 +419,8 @@ void on_stations_selector_changed(GtkWidget * a, gpointer user_data)
        if (girl->selected_station_uri != NULL)
                g_free(girl->selected_station_uri);
 
-       girl->selected_station_uri =
-           g_strdup(g_object_get_data(G_OBJECT(a), "station_uri"));
+       girl->selected_station_uri = g_strdup(g_object_get_data(G_OBJECT(a), "station_uri"));
+
        GIRL_DEBUG_MSG("on_station_select_changed: %s\n", girl->selected_station_uri);
 
        girl->selected_station_name =
@@ -471,8 +461,8 @@ void on_new_station_changed(GtkWidget * a, gpointer user_data)
        /* GList *l = g_list_first(girl_stations); */
        /* stationinfo = l->data; */
 
-       if (girl->selected_station_uri != NULL)
-               g_free(girl->selected_station_uri);
+       /* if (girl->selected_station_uri != NULL) */
+       /*      g_free(girl->selected_station_uri); */
 
        girl->selected_station_uri =
            g_strdup(g_object_get_data(G_OBJECT(a), "station_uri"));
diff --git a/src/girl.xml b/src/girl.xml
index 0d2142b..e7c1f9a 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -1,7 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml-stylesheet type="text/xsl" href="girl.xsl" ?>
-<!DOCTYPE girl SYSTEM "girl-9.2.dtd">
-<girl version="9.2.0">
+<!DOCTYPE girl SYSTEM "girl-9.3.dtd">
+<girl version="9.3.0">
+  <station band="105.3FM" id="urgentfm" lang="be" name="Urgent.fm" rank="1.0" type="edu">
+    <frequency uri="http://www.urgent.fm/";>105.3 FM in Gent, Belgium</frequency>
+    <location>Gent, Belgium</location>
+    <description>
+      Nieuws en informatie over de Gentse studentenzender.
+    </description>
+    <stream mime="audio/mpeg" uri="http://urgent.stream.flumotion.com/urgent/high.mp3.m3u"; codec="MPEG-1 
Layer 3 (MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="127 kbps" />
+    <uri>http://www.urgent.fm/</uri>
+  </station>
+  <station band="99.6FM" id="uradio" lang="el-CY" name="U Radio" rank="1.0" type="edu">
+    <frequency uri="http://www.uradio.com.cy/";>99.6 FM in Nicosia, Cyprus</frequency>
+    <location>Nicosia, Cyprus</location>
+    <description>
+      Nicosia's best Rock and Alternative music station
+    </description>
+    <stream mime="audio/mpeg" uri="http://shout.kalsedia.com:9996/uradio996_64"; codec="MPEG-1 Layer 3 (MP3)" 
samplerate="24000 Hz" channels="Stereo" bitrate="64 kbps" />
+    <uri>http://www.uradio.com.cy/</uri>
+  </station>
   <station band="102.5FM" id="radiouchile" lang="es" name="Radio Uchile" rank="1.0" type="edu">
     <frequency uri="http://radio.uchile.cl/";>102.5 FM in Santiago, Chile</frequency>
     <location>Santiago, Chile</location>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]