[girl] GIRL 8.4.2

From: Ole Aamot <ole src gnome org>
To: commits-list gnome org
Cc:
Subject: [girl] GIRL 8.4.2
Date: Sun, 1 May 2016 12:33:12 +0000 (UTC)
commit 4fb3c64ae246a6a77efffc40719db8031f2e63c6
Author: Ole Aamot <oka oka no>
Date:   Sun May 1 14:32:28 2016 +0200

    GIRL 8.4.2

 README              |   15 +++++++++++++++
 configure           |   20 ++++++++++----------
 configure.ac        |    2 +-
 data/screenshot.png |  Bin 304964 -> 256678 bytes
 girl.spec.in        |    3 +++
 src/girl-station.c  |   32 +++++++++++++++++++++++++-------
 6 files changed, 54 insertions(+), 18 deletions(-)
---
diff --git a/README b/README
index 2676717..8c5abb8 100644
--- a/README
+++ b/README
@@ -1,4 +1,19 @@
 ================
+GIRL 8.4.2 notes
+================
+
+GIRL 8.4.2 was released April 30th, 2016 with working
+GUI support for adding new personal radio channels in
+$HOME/.girl/girl.xml
+
+It is now possible to add local radio stations on a computer that runs GIRL.
+
+Changes since GNOME Internet Radio Locator 8.4.1:
+
+GUI
+       * src/girl-station.c: Create directory in $HOME if it does not exist
+
+================
 GIRL 8.4.1 notes
 ================
 
diff --git a/configure b/configure
index f4cf259..c09d5ca 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 8.4.1.
+# Generated by GNU Autoconf 2.69 for girl 8.4.2.
 #
 #
 # 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='8.4.1'
-PACKAGE_STRING='girl 8.4.1'
+PACKAGE_VERSION='8.4.2'
+PACKAGE_STRING='girl 8.4.2'
 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 8.4.1 to adapt to many kinds of systems.
+\`configure' configures girl 8.4.2 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 8.4.1:";;
+     short | recursive ) echo "Configuration of girl 8.4.2:";;
    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 8.4.1
+girl configure 8.4.2
 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 8.4.1, which was
+It was created by girl $as_me 8.4.2, 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='8.4.1'
+ VERSION='8.4.2'
 
 
 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 8.4.1, which was
+This file was extended by girl $as_me 8.4.2, 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 8.4.1
+girl config.status 8.4.2
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 5c1a739..5d33786 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, 8.4.1)
+AC_INIT(girl, 8.4.2)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/data/screenshot.png b/data/screenshot.png
index d07ea17..baceda3 100644
Binary files a/data/screenshot.png and b/data/screenshot.png differ
diff --git a/girl.spec.in b/girl.spec.in
index 66eb6dc..d1271b3 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -70,6 +70,9 @@ fi
 %{_datadir}/help/*/%{name}
 
 %changelog
+* Sun May 01 2016 Ole Aamot - 8,4.2-1.fc23
+- Girl 8.4.2 build on Fedora Linux 23
+
 * Wed Apr 27 2016 Ole Aamot - 8.4.1-1.fc23
 - Girl 8.4.1 build on Fedora Linux 23
 
diff --git a/src/girl-station.c b/src/girl-station.c
index 88e40de..1f7009d 100644
--- a/src/girl-station.c
+++ b/src/girl-station.c
@@ -2,7 +2,7 @@
  *
  * GNOME Internet Radio Locator
  *
- * Copyright (C) 2014, 2015  Ole Aamot Software
+ * Copyright (C) 2014, 2015, 2016  Ole Aamot Software
  *
  * Author: Ole Aamot <oka oka no>
  *
@@ -621,8 +621,26 @@ gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *sta
        /* GList *girl_local_stations = NULL; */
        gchar *local_station_uri, *local_station_name, *local_station_location, *local_station_band, 
*local_station_description, *local_station_website;
        gchar *stations = g_strconcat(g_get_home_dir(), "/.girl/girl.xml", NULL);
-       /* GList *l = NULL; */
 
+       gboolean local_girl_file = g_file_test (".girl/girl.xml", G_FILE_TEST_EXISTS);
+
+       g_printf("DEBUG: local_girl_file = %i\n", local_girl_file);
+
+       if (local_girl_file == 0) {
+
+               gchar *local_girl_directory = g_strconcat(g_get_home_dir(), "/.girl");
+               g_mkdir_with_parents (local_girl_directory, 0700);
+               
+               // fp = fopen(stations, "w");
+                       
+               // fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE girl SYSTEM 
'girl-8.0.dtd'>\n<girl version='8.0'></girl>\n");
+
+               // fclose(fp);
+       }
+       
+       /* GList *l = NULL; */
+       FILE *fp;
+       
        stationinfo = girl_station_load_from_file(NULL, stations);
 
        new_station = g_new0(GirlStationInfo, 1);
@@ -633,8 +651,8 @@ gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *sta
        new_station->stream = g_new0(GirlStreamInfo, 1);
        new_station->stream->uri = g_strdup(station_uri);
        new_station->uri = g_strdup(station_website);
-       FILE *fp = g_fopen(stations, "w+");
-       g_fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE girl SYSTEM 'girl-7.0.dtd'>\n<girl 
version='7.0'>\n");
+       fp = fopen(stations, "w+");
+       fprintf(fp, "<?xml version='1.0' encoding='UTF-8'?>\n<!DOCTYPE girl SYSTEM 'girl-8.0.dtd'>\n<girl 
version='8.0'>\n");
        // stationinfo-> = l->data;
        while (stationinfo != NULL) {
                local_station_uri = g_strdup(stationinfo->stream->uri);
@@ -644,12 +662,12 @@ gint girl_station_update (GirlStationInfo *head, gchar *station_band, gchar *sta
                local_station_description = g_strdup(stationinfo->description);
                local_station_website = g_strdup(stationinfo->uri);
                /* FIXME: Save mime='audio/mp3' uri='%s' codec='MPEG 1 Audio, Layer 3 (MP3)' 
samplerate='24000 Hz' channels='Mono' bitrate='32 kbps' */
-               g_fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" 
type=\"org\">\n    <frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
local_station_band, local_station_name, local_station_name, local_station_website, local_station_band, 
local_station_location, local_station_location, local_station_description, local_station_uri, 
local_station_website);
+               fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" 
type=\"org\">\n    <frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
local_station_band, local_station_name, local_station_name, local_station_website, local_station_band, 
local_station_location, local_station_location, local_station_description, local_station_uri, 
local_station_website);
                stationinfo = stationinfo->next;
 
        }
-       g_fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" type=\"org\">\n  
  <frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
new_station->band, new_station->name, new_station->name, new_station->uri, new_station->band, 
new_station->location, new_station->location, new_station->description, new_station->uri, new_station->uri);
-       g_fprintf(fp, "</girl>\n");
+       fprintf(fp, "  <station band=\"%s\" id=\"%s\" lang=\"en\" name=\"%s\" rank=\"1.0\" type=\"org\">\n    
<frequency uri=\"%s\">%s in %s</frequency>\n    <location>%s</location>\n    <description 
lang=\"en\">%s</description>\n    <stream uri=\"%s\" />\n    <uri>%s</uri>\n  </station>\n", 
new_station->band, new_station->name, new_station->name, new_station->uri, new_station->band, 
new_station->location, new_station->location, new_station->description, new_station->uri, new_station->uri);
+       fprintf(fp, "</girl>\n");
        fclose(fp);
        girl_stations = g_list_append(girl_stations, (GirlStationInfo *)new_station);
        g_free(stations);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]