GNOME.org
 

[girl] GIRL 1.7.0

commit d8f0d977732b30362b4aa26540b2142b4ad828f1
Author: Ole Aamot <oka oka no>
Date:   Sun Mar 8 01:28:22 2015 +0100

    GIRL 1.7.0

 configure           |   20 ++++++++++----------
 configure.ac        |    2 +-
 data/screenshot.png |  Bin 172304 -> 162426 bytes
 girl.spec.in        |    3 +++
 src/girl.c          |   17 ++++++++---------
 src/girl.xml        |   11 +++++++++++
 6 files changed, 33 insertions(+), 20 deletions(-)
---
diff --git a/configure b/configure
index 1d3e20e..1016c9c 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 1.6.0.
+# Generated by GNU Autoconf 2.69 for girl 1.7.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='1.6.0'
-PACKAGE_STRING='girl 1.6.0'
+PACKAGE_VERSION='1.7.0'
+PACKAGE_STRING='girl 1.7.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 1.6.0 to adapt to many kinds of systems.
+\`configure' configures girl 1.7.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 1.6.0:";;
+     short | recursive ) echo "Configuration of girl 1.7.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 1.6.0
+girl configure 1.7.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 1.6.0, which was
+It was created by girl $as_me 1.7.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='1.6.0'
+ VERSION='1.7.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -6706,7 +6706,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 1.6.0, which was
+This file was extended by girl $as_me 1.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -6772,7 +6772,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 1.6.0
+girl config.status 1.7.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index db117fd..30223e4 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, 1.6.0)
+AC_INIT(girl, 1.7.0)
 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 c402819..c48cf75 100644
Binary files a/data/screenshot.png and b/data/screenshot.png differ
diff --git a/girl.spec.in b/girl.spec.in
index abe66a3..2adfa96 100644
--- a/girl.spec.in
+++ b/girl.spec.in
@@ -67,6 +67,9 @@ fi
 %{_mandir}/man1/%{name}.1*
 
 %changelog
+* Sun Mar 08 2015 Ole Aamot - 1.7.0-1.fc21
+- Girl 1.7.0 build on Fedora Linux 21
+
 * Sat Mar 07 2015 Ole Aamot - 1.6.0-1.fc21
 - Girl 1.6.0 build on Fedora Linux 21
 
diff --git a/src/girl.c b/src/girl.c
index 8d36582..6387708 100644
--- a/src/girl.c
+++ b/src/girl.c
@@ -589,26 +589,25 @@ void about_program(GtkWidget * a, gpointer user_data)
                NULL,
        };
 
+       about_program->window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
+
+       
        if (about_program) {
                gdk_window_raise(about_program->window);
+               gtk_widget_show(about_program->window);
                return;
        }
 
-       if (girl->selected_program_name != NULL) {
-               about_program = gnome_about_new(girl->selected_program_name,
-                                               girl->selected_program_band,
-                                               girl->selected_program_location,
-                                               girl->selected_program_description,
-                                               authors,
-                                               NULL,
-                                               NULL,
-                                               girl->icon);
+       if (strcmp(girl->selected_station_name, "KEXP")==0) {
+
+
                g_signal_connect(G_OBJECT(about_program), "destroy",
                                 G_CALLBACK(gtk_widget_destroy), NULL);
                g_signal_connect(G_OBJECT(about_program), "delete-event",
                                 G_CALLBACK(gtk_widget_destroy), NULL);
                g_object_add_weak_pointer(G_OBJECT(about_program), (void **) &(about_program));
                gtk_widget_show(about_program);
+               printf("%s\n", "Test");
        }
 
 }
diff --git a/src/girl.xml b/src/girl.xml
index d7b7500..a3509e9 100644
--- a/src/girl.xml
+++ b/src/girl.xml
@@ -2,6 +2,17 @@
 <?xml-stylesheet type="text/xsl" href="http://www.ping.uio.no/~oka/src/girl/girl.xsl"; ?>
 <!DOCTYPE girl SYSTEM "girl-1.6.dtd">
 <girl version="1.6">
+  <station band="99.3FM" id="radiorakel" lang="en" name="radiOrakel" rank="1.0" type="edu">
+    <frequency uri="http://radiorakel.no/";>99.3 FM in Oslo, Norway</frequency>
+    <location>Oslo, Norway</location>
+    <description>RadiOrakel was started in 1982 when the government allowed local radio operations in 
Norway. At a women's cultural festival a group of women collected funds to start up the world's first women's 
radio station. On 16th of October 1982, RadiOrakel was founded.
+
+    Since 1982 RadiOrakel has produced experimental journalism with the aim of educating women in 
radio-journalism and audio engineering. RadiOrakel has a minimum of 2 / 3 female members. RadiOrakel actively 
prioritizes and promotes women as both interviewers and interviewees, and also has a profile with at least 
50% of all music being performed by female performers / musicians. RadiOrakel also seeks to combat 
discrimination based on gender, race, religion and sexual orientation.
+
+    RadiOrakel is located at the Blitz House on Pilestredet 30E in Oslo. They broadcast daily from 1:00 p.m. 
to 7:00 p.m., and on Friday’s and Saturday’s from 9:00 a.m. to 7:00 p.m. on FM 99.3 in Oslo and surrounding 
areas.  Broadcasts are streamed over the Internet.</description>
+    <stream mime="audio/mpeg" uri="http://stream.radionova.no/fm993.mp3"; codec="MPEG 1 Audio, Layer 3 (MP3)" 
samplerate="44100 Hz" channels="Stereo" bitrate="128 kbps" />
+    <uri>http://radiorakel.no/</uri>
+  </station>
   <station band="1560AM" id="kxsc" lang="en" name="KXSC" rank="1.0" type="edu">
     <frequency uri="http://kxsc.org/";>1560 AM in Los Angeles, CA</frequency>
     <location>Los Angeles, CA</location>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]