[girl] girl version 0.9.0



commit 6ab9303207308946d710700c588ed3ecdcbdca5d
Author: Ole Aamot <oka oka no>
Date:   Sun Dec 28 14:17:41 2014 +0100

    girl version 0.9.0

 AUTHORS                          |    2 +
 ChangeLog                        |   15 +++++++++++++
 Makefile.am                      |    1 +
 Makefile.in                      |    1 +
 NEWS                             |   15 +++++++++++++
 README                           |    2 +-
 THANKS                           |    2 +
 configure                        |   20 ++++++++--------
 configure.ac                     |    2 +-
 data/icons/16x16/apps/girl.png   |  Bin 781 -> 610 bytes
 data/icons/22x22/apps/girl.png   |  Bin 1020 -> 1050 bytes
 data/icons/24x24/apps/girl.png   |  Bin 4109 -> 1097 bytes
 data/icons/256x256/apps/girl.png |  Bin 2803 -> 43992 bytes
 data/icons/32x32/apps/girl.png   |  Bin 4109 -> 1544 bytes
 data/icons/48x48/apps/girl.png   |  Bin 2803 -> 2988 bytes
 data/screenshot.png              |  Bin 100925 -> 113604 bytes
 girl.spec.in                     |    3 ++
 man/Makefile                     |    6 ++--
 src/girl-gui.c                   |   43 ++++++++++++++++++-------------------
 src/girl.c                       |    8 +++---
 src/girl.png                     |  Bin 4655 -> 2988 bytes
 src/stations.xml                 |   37 ++++++++++++++++++++++++++++++-
 22 files changed, 114 insertions(+), 43 deletions(-)
---
diff --git a/AUTHORS b/AUTHORS
index 09725d7..5f264dd 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,3 +5,5 @@ Rafael Ferreira <rafael f f1 gmail com> (Brazilian Portuguese translation)
 Wolfgang Stöggl (German translation)
 Piotr Drąg (Polish translation)
 Muhammet Kara (Turkish translation)
+Balázs Úr (Hungarian translation)
+Aly Raj (Icon design)
diff --git a/ChangeLog b/ChangeLog
index 7e0d1e9..ecff13a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2014-12-28  Ole Aamot  <oka oka no>
+
+       * src/stations.xml: Add COOG (coogradio.com)
+       * src/stations.xml: Add EPER (eper.elte.hu)
+       * src/stations.xml: Add URY (ury.org.uk)
+       * src/stations.xml: Add WVUA-FM (wvuafm.ua.edu)
+
+2014-12-27  Ole Aamot  <oka oka no>
+
+       * NEWS: girl version 0.9.0 "It Girl" release
+       * po/cs.po: Updated Czech translation by Marek Černocký
+       * po/hu.po: Hungarian translation by Balázs Úr
+       * po/sr.po: Updated Serbian translation by Мирослав Николић
+       * po/sr latin po: Updated Serbian translation by Miroslav Nikolić
+
 2014-12-20  Ole Aamot  <oka oka no>
 
        * NEWS: girl version 0.8.0 "Cinnamon Girl" release
diff --git a/Makefile.am b/Makefile.am
index b5da814..f551d41 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ EXTRA_DIST = config.rpath m4/ChangeLog  \
        NEWS-0.6 \
        NEWS-0.7 \
        NEWS-0.8 \
+       NEWS-0.9 \
        THANKS \
        TODO \
        girl.spec.in
diff --git a/Makefile.in b/Makefile.in
index eea96b2..2c4dac9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -330,6 +330,7 @@ EXTRA_DIST = config.rpath m4/ChangeLog  \
        NEWS-0.6 \
        NEWS-0.7 \
        NEWS-0.8 \
+       NEWS-0.9 \
        THANKS \
        TODO \
        girl.spec.in
diff --git a/NEWS b/NEWS
index 3b6d6f5..42b0b8d 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+2014-12-28  Ole Aamot  <oka oka no>
+
+       * src/stations.xml: Add EPER (eper.elte.hu)
+       * src/stations.xml: Add URY (ury.org.uk)
+       * src/stations.xml: Add WVUA-FM (wvuafm.ua.edu)
+       * src/stations.xml: Add COOG (coogradio.com)
+
+2014-12-27  Ole Aamot  <oka oka no>
+
+       * girl version 0.9.0 "It Girl" release
+       * po/cs.po: Updated Czech translation by Marek Černocký
+       * po/hu.po: Hungarian translation by Balázs Úr
+       * po/sr.po: Updated Serbian translation by Мирослав Николић
+       * po/sr latin po: Updated Serbian translation by Miroslav Nikolić
+
 2014-12-20  Ole Aamot  <oka oka no>
 
        * NEWS: girl version 0.8.0 "Cinnamon Girl" release
diff --git a/README b/README
index 8a90f39..3f3b766 100644
--- a/README
+++ b/README
@@ -1,5 +1,5 @@
 ==============
-GIRL 0.7 notes
+GIRL 0.9 notes
 ==============
 
 GIRL is a GNOME Internet Radio Locator program that allows the user
diff --git a/THANKS b/THANKS
index ed54cb2..4375b7a 100644
--- a/THANKS
+++ b/THANKS
@@ -7,3 +7,5 @@ Hans Petter Jansson for help with debugging GNOME VFS.
 Ettore Perazzoli (June 15, 1974 - December 10, 2003) for GNOME VFS.
 Bernd Homuth for minor spelling correction.
 Muhammet Kara for Turkish translation.
+Balázs Úr for Hungarian translation.
+Aly Raj for icon design.
diff --git a/configure b/configure
index 65331e9..b76fbea 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.8.0.
+# Generated by GNU Autoconf 2.69 for girl 0.9.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='0.8.0'
-PACKAGE_STRING='girl 0.8.0'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='girl 0.9.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1329,7 +1329,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.8.0 to adapt to many kinds of systems.
+\`configure' configures girl 0.9.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1395,7 +1395,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 0.8.0:";;
+     short | recursive ) echo "Configuration of girl 0.9.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1499,7 +1499,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 0.8.0
+girl configure 0.9.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1864,7 +1864,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.8.0, which was
+It was created by girl $as_me 0.9.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2727,7 +2727,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='0.8.0'
+ VERSION='0.9.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6707,7 +6707,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.8.0, which was
+This file was extended by girl $as_me 0.9.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6773,7 +6773,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.8.0
+girl config.status 0.9.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index f417110..5fef24c 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.8.0)
+AC_INIT(girl, 0.9.0)
 AM_INIT_AUTOMAKE([no-dist-gzip dist-xz])
 AC_CONFIG_SRCDIR([src/girl.c])
 AC_CONFIG_HEADER([config.h])
diff --git a/data/icons/16x16/apps/girl.png b/data/icons/16x16/apps/girl.png
index 4ed26ef..43e7d14 100644
Binary files a/data/icons/16x16/apps/girl.png and b/data/icons/16x16/apps/girl.png differ
diff --git a/data/icons/22x22/apps/girl.png b/data/icons/22x22/apps/girl.png
index d26a56c..80dfe71 100644
Binary files a/data/icons/22x22/apps/girl.png and b/data/icons/22x22/apps/girl.png differ
diff --git a/data/icons/24x24/apps/girl.png b/data/icons/24x24/apps/girl.png
index 1c69ac3..cb44928 100644
Binary files a/data/icons/24x24/apps/girl.png and b/data/icons/24x24/apps/girl.png differ
diff --git a/data/icons/256x256/apps/girl.png b/data/icons/256x256/apps/girl.png
index b5d81aa..b3caed5 100644
Binary files a/data/icons/256x256/apps/girl.png and b/data/icons/256x256/apps/girl.png differ
diff --git a/data/icons/32x32/apps/girl.png b/data/icons/32x32/apps/girl.png
index 1c69ac3..7490091 100644
Binary files a/data/icons/32x32/apps/girl.png and b/data/icons/32x32/apps/girl.png differ
diff --git a/data/icons/48x48/apps/girl.png b/data/icons/48x48/apps/girl.png
index b5d81aa..80c9aa5 100644
Binary files a/data/icons/48x48/apps/girl.png and b/data/icons/48x48/apps/girl.png differ
diff --git a/data/screenshot.png b/data/screenshot.png
index f51fc60..4cec0b4 100644
Binary files a/data/screenshot.png and b/data/screenshot.png differ
diff --git a/girl.spec.in b/girl.spec.in
index d739f37..27bd755 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -74,6 +74,9 @@ make DESTDIR=%{buildroot} install
 %{_mandir}/man1/girl.1.gz
 
 %changelog
+* Sat Dec 27 2014 Ole Aamot - 0.9.0-1
+- Girl 0.9.0 build on Fedora Linux 21
+
 * Sat Dec 20 2014 Ole Aamot - 0.8.0-1
 - Girl 0.8.0 build on Fedora Linux 21
 
diff --git a/man/Makefile b/man/Makefile
index 5fca21d..2c79cac 100644
--- a/man/Makefile
+++ b/man/Makefile
@@ -201,10 +201,10 @@ OBJEXT = o
 PACKAGE = girl
 PACKAGE_BUGREPORT = 
 PACKAGE_NAME = girl
-PACKAGE_STRING = girl 0.8.0
+PACKAGE_STRING = girl 0.9.0
 PACKAGE_TARNAME = girl
 PACKAGE_URL = 
-PACKAGE_VERSION = 0.8.0
+PACKAGE_VERSION = 0.9.0
 PATH_SEPARATOR = :
 PKG_CONFIG = /usr/bin/pkg-config
 PKG_CONFIG_LIBDIR = 
@@ -217,7 +217,7 @@ SET_MAKE =
 SHELL = /bin/sh
 STRIP = 
 USE_NLS = yes
-VERSION = 0.8.0
+VERSION = 0.9.0
 XGETTEXT = /usr/bin/xgettext
 abs_builddir = /home/oka/git/gnome/girl/man
 abs_srcdir = /home/oka/git/gnome/girl/man
diff --git a/src/girl-gui.c b/src/girl-gui.c
index 05e0bf2..b9f11bc 100644
--- a/src/girl-gui.c
+++ b/src/girl-gui.c
@@ -150,9 +150,6 @@ GtkWidget *create_listeners_selector(char *selected_listener_uri,
                                                           "girl/listeners.xml",
                                                           FALSE,
                                                           NULL);
-
-       /* world_listener_xml_uri = g_strdup("http://girl.src.oka.no/listeners.xml";); */
-
        MSG("world_listener_xml_uri = %s\n",
            world_listener_xml_uri);
 
@@ -286,11 +283,13 @@ GtkWidget *create_programs_selector(char *selected_program_uri,
 
        /* creating the menu items */
 
-       world_program_xml_filename = gnome_program_locate_file(NULL,
-                                                              GNOME_FILE_DOMAIN_APP_DATADIR,
-                                                              "girl/programs.xml",
-                                                              FALSE,
-                                                              NULL);
+       /* world_program_xml_filename = gnome_program_locate_file(NULL, */
+       /*                                                 GNOME_FILE_DOMAIN_APP_DATADIR, */
+       /*                                                 "girl/programs.xml", */
+       /*                                                 FALSE, */
+       /*                                                 NULL); */
+       world_program_xml_filename = g_strconcat(DATADIR, "/girl/programs.xml", NULL);
+
        /* world_program_xml_filename = g_strdup("http://girl.src.oka.no/programs.xml";); */
 
        MSG("world_program_xml_filename = %s\n",
@@ -418,13 +417,15 @@ GtkWidget *create_stations_selector(char *selected_station_uri,
 
        /* creating the menu items */
 
-       world_station_xml_filename = gnome_program_locate_file(NULL,
-                                                              GNOME_FILE_DOMAIN_APP_DATADIR,
-                                                              "girl/stations.xml",
-                                                              FALSE,
-                                                              NULL);
+       /* world_station_xml_filename = gnome_program_locate_file(NULL, */
+       /*                                                     GNOME_FILE_DOMAIN_APP_DATADIR, */
+       /*                                                     "girl/stations.xml", */
+       /*                                                     FALSE, */
+       /*                                                     NULL); */
+
        /* world_station_xml_filename = g_strdup("http://girl.src.oka.no/stations.xml";); */
 
+       world_station_xml_filename = g_strconcat(DATADIR, "/girl/stations.xml", NULL);
        MSG("world_station_xml_filename = %s\n",
            world_station_xml_filename);
 
@@ -551,13 +552,13 @@ GtkWidget *create_streams_selector(char *selected_streams_uri,
 
        /* creating the menu items */
 
-       world_streams_xml_filename = gnome_program_locate_file(NULL,
-                                                              GNOME_FILE_DOMAIN_APP_DATADIR,
-                                                              "girl/streams.xml",
-                                                              FALSE,
-                                                              NULL);
+       /* world_streams_xml_filename = gnome_program_locate_file(NULL, */
+       /*                                                     GNOME_FILE_DOMAIN_APP_DATADIR, */
+       /*                                                     "girl/streams.xml", */
+       /*                                                     FALSE, */
+       /*                                                     NULL); */
+       world_streams_xml_filename = g_strconcat(DATADIR, "/girl/streams.xml", NULL);
        /* world_streams_xml_filename = g_strdup("http://girl.src.oka.no/streams.xml";); */
-
        MSG("world_streams_xml_filename = %s\n",
            world_streams_xml_filename);
 
@@ -706,9 +707,7 @@ GtkWidget *create_girl_app()
        gtk_widget_show(vbox1);
        gnome_app_set_contents(GNOME_APP(girl_app), vbox1);
 
-       pmf = gnome_program_locate_file(NULL,
-                                       GNOME_FILE_DOMAIN_APP_DATADIR,
-                                       "girl/pixmaps/girl-map.png", FALSE, NULL);
+       pmf = g_strconcat(DATADIR, "/girl/pixmaps/girl-map.png", NULL);
 
        girl_pixmap = gtk_image_new_from_file(pmf);
        g_free(pmf);
diff --git a/src/girl.c b/src/girl.c
index 9c87453..212f17a 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -111,9 +111,9 @@ int main(int argc, char *argv[])
        g_object_add_weak_pointer(G_OBJECT(streams_selector),
                                  (void **) &(streams_selector));
        /* Icons */
-       iconname = gnome_program_locate_file(NULL,
-                                            GNOME_FILE_DOMAIN_APP_PIXMAP,
-                                            "girl/icons/hicolor/48x48/apps/girl.png", TRUE, NULL);
+
+       iconname = g_strconcat(DATADIR, "/girl/girl.png", NULL);
+
        if (iconname != NULL) {
                girl->icon = gdk_pixbuf_new_from_file(iconname, NULL);
                g_free(iconname);
@@ -531,7 +531,7 @@ void about_app(GtkWidget * a, gpointer user_data)
                return;
        }
 
-       about = gnome_about_new(_("GNOME Internet Radio Locator"), VERSION, _("Copyright 2014 Ole Aamot 
Software\nCopyright 2002 Free Software Foundation"), _("Internet Radio Locator"), (const gchar **) authors, 
NULL,       /* documenters */
+       about = gnome_about_new(_("GNOME Internet Radio Locator"), VERSION, _("Copyright 2014 Ole Aamot 
Software\nCopyright 2002 Free Software Foundation"), _("Locate Internet Radio Stations"), (const gchar **) 
authors, NULL,       /* documenters */
                                strcmp(translator_credits,
                                       "translator_credits") !=
                                0 ? translator_credits : NULL, girl->icon);
diff --git a/src/girl.png b/src/girl.png
index 12a1876..80c9aa5 100644
Binary files a/src/girl.png and b/src/girl.png differ
diff --git a/src/stations.xml b/src/stations.xml
index 7aad104..f7dc1b9 100644
--- a/src/stations.xml
+++ b/src/stations.xml
@@ -1,10 +1,43 @@
 <?xml version="1.0"?>
-<!DOCTYPE girl SYSTEM "girl-0.8.dtd">
-<girl version="0.8">
+<!DOCTYPE girl SYSTEM "girl-0.9.dtd">
+<girl version="0.9">
+  <station id="coog" name="COOG" rank="1.0" type="edu" release="online">
+    <frequency uri="http://coogradio.uh.edu/";></frequency>
+    <location>Houston, TX</location>
+    <description>Coog Radio is an online radio station operated and staffed by students from the University 
of Houston. Co-founders Conner Clifton, Markley Rogers, and Matt Womack came up with the idea in 2010, but it 
wasn’t until fall 2011 that the idea finally came to fruition. Coog Radio not only provides a creative outlet 
for fellow students to express themselves over the air, but also introduces them to the world of 
broadcasting.</description>
+    <stream mime="audio/mpeg" uri="http://coogradio.uh.edu:8000/coogradio.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="48000 Hz" channels="Stereo" bitrate="128 kbps" />
+  </station>
+  <station id="wvua" name="WVUA-FM" rank="1.0" type="edu" release="90.7">
+    <frequency uri="http://wvuafm.ua.edu/";></frequency>
+    <location>Tuscaloosa, AL</location>
+    <description>WVUA-FM is the University’s only student operated radio station. Its history dates back to 
1940 when the Department of Radio Arts began operation of an AM carrier-current station (the signal was 
transmitted to dormitories and other buildings on campus through electrical wiring). The station was known as 
BRN (the Bama Radio Network). In 1947, the signal was extended and the station became known as WABP. The 
station was operated as a commercial venture at 570 on the AM dial. During the 1950’s and 1960’s, as more 
students moved off campus, the station’s listenership dwindled.</description>
+    <stream mime="audio/mpeg" uri="http://ice8.securenetsystems.net/WVUA"; codec="MPEG-4 AAC" 
samplerate="44100 Hz" channels="Stereo" bitrate="30 kbps" />
+  </station>
+  <station id="ury" name="University Radio York" rank="1.0" type="edu" release="1350" lang="en">
+    <frequency uri="http://ury.org.uk/";></frequency>
+    <location>York, United Kingdom</location>
+    <description>University Radio York (URY) is the student radio station for the University of York, 
broadcasting 24 hours a day during term time on 1350am across the University's Heslington Campus and 
worldwide via this website.
+
+    The station is run by students for students, meaning the people behind the station understand what the 
listenership want to hear.
+
+    With no playlist and no set format to many of our shows, our presenters have the chance to try whatever 
they like, as long as it's legal!</description>
+    <stream mime="audio/mpeg" uri="http://ury.york.ac.uk/audio/live-mobile.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="48 kbps" />
+    <stream mime="audio/mpeg" uri="http://ury.york.ac.uk/audio/live-low.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="96 kbps" />
+    <stream mime="audio/mpeg" uri="http://ury.york.ac.uk/audio/live-high.m3u"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="192 kbps" />
+  </station>
+  <station id="eper" name="EPER" rank="1.0" type="edu" release="97.0" lang="en">
+    <frequency uri="http://eper.elte.hu/";></frequency>
+    <location>Budapest, Hungary</location>
+    <description>EPER is a non-profit small power community station in downtown Budapest. We broadcast from 
the buildings of the Eötvös Loránd University. Our staff is students and teachers of the University or of 
other institutions of higher education.</description>
+    <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/eper2"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Mono" bitrate="64 kbps" />
+    <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/eper24"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="22050 Hz" channels="Mono" bitrate="24 kbps" />
+    <stream mime="audio/mpeg" uri="http://radio.elte.hu:8000/live24"; codec="MPEG-2 AAC" samplerate="32000 
Hz" channels="Stereo" bitrate="24 kbps" />
+  </station>
   <station id="burstradio" name="Burst Radio" rank="1.0" type="edu" release="" lang="en">
     <frequency uri="http://www.burstradio.co.uk/";></frequency>
     <location>Brighton, United Kingdom</location>
     <description>Burst aims to capture the essential essence of student life at Brighton University; distil 
it and broadcast this elixir to you.</description>
+    <stream mime="audio/mpeg" uri="http://burst.brighton.ac.uk:8000/burst.mp3"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="22050 Hz" channels="Mono" bitrate="24 kbps" />
     <stream mime="audio/mpeg" uri="http://burst.brighton.ac.uk:8000/burst.mp3"; codec="MPEG 1 Audio, Layer 3 
(MP3)" samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
   </station>
   <station id="fusefm" name="Fuse FM" rank="1.0" type="edu" release="" lang="en">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]