GNOME.org
 

[girl] girl version 0.5.1

commit 9933edd29372696008af6cbb8aaee551023d5262
Author: Ole Aamot <oka oka no>
Date:   Sat Nov 29 13:48:36 2014 +0100

    girl version 0.5.1

 ChangeLog           |    1 +
 NEWS                |  124 ++++++++++++++++++++++++++++++++------------------
 configure           |   20 ++++----
 configure.ac        |    2 +-
 src/girl-gui.c      |    4 +-
 src/girl-listener.c |    5 ++
 src/girl-station.c  |   10 ++++
 src/girl-station.h  |    2 +
 8 files changed, 110 insertions(+), 58 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a452a88..2ad274b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        * NEWS: girl 0.5.1 released.
        * po/sr.po: Serbian translation by Мирослав Николић
        * po/sr latin po: Serbian translation by Miroslav Nikolić
+       * src/girl-station.[ch]: Add station rank, type variables
 
 2014-11-29  Ole Aamot  <oka oka no>
 
diff --git a/NEWS b/NEWS
index 41d5fe8..bc4be02 100644
--- a/NEWS
+++ b/NEWS
@@ -1,67 +1,101 @@
-2014-11-29  Ole Aamot  <oka oka no>
+=============
+Version 0.5.1
+=============
 
-       * girl version 0.5.0 release
-       * src/girl.c: Initial Previous Station / Next Station support
-       * src/girl-gui.c: Add Previous Station / Next Station buttons
-       * src/stations.xml: Add Radio Campus Paris (radiocampusparis.org).
-       * src/stations.xml: Add WCSB (wcsb.org).
-       * src/stations.xml: Add Radio Campus de l’Université Libre de Bruxelles (radiocampus.be).
-       * src/stations.xml: Add Coimbra University Radio (ruc.pt).
+Translations
 
-2014-11-27  Ole Aamot  <oka oka no>
+       * sr (Мирослав Николић), sr latin (Miroslav Nikolić).
 
-       * girl version 0.4.1 release
-       * AUTHORS: Add Marek Černocký (Czech translation)
-       * AUTHORS: Add Rafael Ferreira (Brazilian Portuguese translation)
-       * po/cs.po: Czech translation by Marek Černocký
-       * po/pt_BR.po: Brazilian Portuguese translation by Rafael Ferreira
-       * src/girl-0.5.dtd: Add station type property.
-       * src/stations.xml: Add Cam FM (www.camfm.co.uk).
-       * src/stations.xml: Add Oxford Student Radio (oxideradio.co.uk).
-       * src/stations.xml: Add Pulse LSE (pulselse.co.uk).
-       * src/stations.xml: Add Radio UNAM (www.radiounam.unam.mx).
+=============
+Version 0.5.0
+=============
 
-2014-11-22  Ole Aamot  <oka oka no>
+GUI (src/girl-gui.c)
 
-       * girl version 0.4.0 release
-       * src/stations.xml: Add WXYC (wxyc.org)
-       * src/stations.xml: Add KALX (kalx.berkeley.edu)
-       * src/stations.xml: Add WHRB (whrb.org)
-       * src/stations.xml: Add Radio NOVA (radionova.no)
-       * src/girl-0.4.dtd: Add station rank property.
+       * Add Previous Station / Next Station buttons.
+       * Experimental Previous Station / Next Station support.
 
-2014-11-16  Ole Aamot  <oka oka no>
+Stations (src/stations.xml)
 
-       * girl version 0.3.2 release
-       * src/stations.xml: Add WWNO (wwno.org)
+       * Add Radio Campus Paris (radiocampusparis.org).
+       * Add WCSB (wcsb.org).
+       * Add Radio Campus de l’Université Libre de Bruxelles (radiocampus.be).
+       * Add Coimbra University Radio (ruc.pt).
 
-2014-11-15  Ole Aamot  <oka oka no>
+=============
+Version 0.4.1
+=============
 
-       * girl version 0.3.1 release
-       * src/stations.xml: Add KTRU (ktru.org)
+Girl DTD (src/girl-0.5.dtd)
 
-2014-11-14  Ole Aamot  <oka oka no>
+       * Add station type property.
 
+Stations (src/stations.xml)
+
+       * Add Cam FM (www.camfm.co.uk).
+       * Add Oxford Student Radio (oxideradio.co.uk).
+       * Add Pulse LSE (pulselse.co.uk).
+       * Add Radio UNAM (www.radiounam.unam.mx).
+
+Translations
+
+       * cs (Czech translation by Marek Černocký)
+       * pt_BR (Brazilian Portuguese translation by Rafael Ferreira)
+
+=============
+Version 0.4.0
+=============
+
+Girl DTD (src/girl-0.4.dtd):
+
+       * Add station rank property.
+
+Stations (src/stations.xml):
+
+       * Add WXYC (wxyc.org)
+       * Add KALX (kalx.berkeley.edu)
+       * Add WHRB (whrb.org)
+       * Add Radio NOVA (radionova.no)
+
+=============
+Version 0.3.2
+=============
+
+Stations (src/stations.xml):
+
+       * Add WWNO (wwno.org)
+
+=============
+Version 0.3.1
+=============
+
+Stations (src/stations.xml):
+
+       * Add KTRU (ktru.org)
        * src/stations.xml: Add NRK Radio Alltid Nyheter (nrk.no)
        * src/stations.xml: Add BBC World Service (bbc.co.uk)
-       * src/stations.xml: Add WKCR (wkcr.org)
-
-2014-11-07  Ole Aamot  <oka oka no>
 
-       * src/stations.xml: Add support for WMBR (wmbr.org)
+=============
+Version 0.3.0
+=============
 
-2014-11-04  Ole Aamot  <oka oka no>
+Stations (src/stations.xml):
 
-       * src/stations.xml: Add support for KEXP (kexp.org)
+       * Add WKCR (wkcr.org)
 
-2014-11-02  Ole Aamot  <oka oka no>
+=============
+Version 0.2.0
+=============
 
-       * girl version 0.1.2 release
+Stations (src/stations.xml):
 
-2014-11-01  Ole Aamot  <oka oka no>
+       * Add support for WMBR (wmbr.org)
+       * Add support for KEXP (kexp.org)
 
-       * girl version 0.1.1 release
+=============
+Version 0.1.0
+=============
 
-2002-09-21  Ole Aamot  <ole gnu org>
+GUI (src/girl-gui.c)
 
-       * Project started.
+       * Initial release.
\ No newline at end of file
diff --git a/configure b/configure
index 6433231..238f70c 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 0.5.0.
+# Generated by GNU Autoconf 2.69 for girl 0.5.1.
 #
 #
 # 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='0.5.0'
-PACKAGE_STRING='girl 0.5.0'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='girl 0.5.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1324,7 +1324,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 0.5.0 to adapt to many kinds of systems.
+\`configure' configures girl 0.5.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1390,7 +1390,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 0.5.0:";;
+     short | recursive ) echo "Configuration of girl 0.5.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1489,7 +1489,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 0.5.0
+girl configure 0.5.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1854,7 +1854,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 0.5.0, which was
+It was created by girl $as_me 0.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2717,7 +2717,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='0.5.0'
+ VERSION='0.5.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6550,7 +6550,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 0.5.0, which was
+This file was extended by girl $as_me 0.5.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6616,7 +6616,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 0.5.0
+girl config.status 0.5.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 303ff45..6dd6e57 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, 0.5.0)
+AC_INIT(girl, 0.5.1)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/src/girl-gui.c b/src/girl-gui.c
index 833e8bf..c6e9518 100644
--- a/src/girl-gui.c
+++ b/src/girl-gui.c
@@ -154,7 +154,7 @@ GtkWidget *create_listeners_selector(char *selected_listener_uri,
            girl_listener_load_from_file(locallistener,
                                         world_listener_xml_uri);
 
-       girl_listeners = NULL;
+       /* girl_listeners = NULL; */
 
        while (listenerinfo != NULL) {
 
@@ -165,7 +165,7 @@ GtkWidget *create_listeners_selector(char *selected_listener_uri,
                listener_name = g_strdup(listenerinfo->name);
                listener_location = g_strdup(listenerinfo->location);
 
-               girl_listeners = g_list_append(girl_listeners,(GirlListenerInfo *)listenerinfo);
+               /* girl_listeners = g_list_append(girl_listeners,(GirlListenerInfo *)listenerinfo); */
 
                if (label != NULL) {
                        item = gtk_menu_item_new_with_label(label);
diff --git a/src/girl-listener.c b/src/girl-listener.c
index 3f40ba2..b8ad4d6 100644
--- a/src/girl-listener.c
+++ b/src/girl-listener.c
@@ -41,6 +41,9 @@
 
 /* extern GirlListenerInfo *girllistener; */
 
+extern GList *girl_stations;
+extern GList *girl_listeners;
+
 static void
 girl_listener_parser(GirlListenerInfo * listener, xmlDocPtr doc,
                     xmlNodePtr cur)
@@ -174,6 +177,8 @@ GirlListenerInfo *girl_listener_load_from_file(GirlListenerInfo * head,
 
                        head = curr;
 
+                       girl_listeners = g_list_append(girl_listeners, (GirlListenerInfo *) curr);
+
                        MSG("Done with parsing the listener..\n");
 
                }
diff --git a/src/girl-station.c b/src/girl-station.c
index 7d41468..c2d4715 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -138,6 +138,10 @@ girl_station_parser(GirlStationInfo * station, xmlDocPtr doc,
        MSG("station->id = %s\n", station->id);
        station->name = xmlGetProp(cur, "name");
        MSG("station->name = %s\n", station->name);
+       station->rank = xmlGetProp(cur, "rank");
+       MSG("station->rank = %s\n", station->rank);
+       station->type = xmlGetProp(cur, "type");
+       MSG("station->type = %s\n", station->type);
 
        sub = cur->xmlChildrenNode;
 
@@ -249,6 +253,7 @@ GirlStationInfo *girl_station_load_from_file(GirlStationInfo * head,
        xmlNodePtr cur = NULL;
        GirlStationInfo *curr = NULL;
        char *version;
+       GirlStationInfo *mem_station;
 
        g_return_val_if_fail(filename != NULL, NULL);
 
@@ -291,6 +296,7 @@ GirlStationInfo *girl_station_load_from_file(GirlStationInfo * head,
                        MSG("Found a new station.\n");
 
                        curr = g_new0(GirlStationInfo, 1);
+                       mem_station = g_new0(GirlStationInfo, 1);
 
                        girl_station_parser(curr, doc, cur);
 
@@ -298,6 +304,10 @@ GirlStationInfo *girl_station_load_from_file(GirlStationInfo * head,
 
                        head = curr;
 
+                       mem_station = head;
+
+                       girl_stations = g_list_append(girl_stations, (GirlStationInfo *)mem_station);
+
                        MSG("Done with parsing the station.\n");
 
                }
diff --git a/src/girl-station.h b/src/girl-station.h
index c1195da..ae41164 100644
--- a/src/girl-station.h
+++ b/src/girl-station.h
@@ -45,6 +45,8 @@ struct _GirlStationInfo {
        GtkWidget *widget;
        gchar *id;
        gchar *name;
+       gchar *rank;
+       gchar *type;
        gchar *frequency;
        gchar *location;
        gchar *description;
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]