[girl] Remove player frontend on new search result



commit 496189b0543321e267cfef3bc9ff78c99614d60a
Author: Ole Aamot <oka oka no>
Date:   Sat Dec 3 16:33:34 2016 +0100

    Remove player frontend on new search result

 configure      |   20 ++++++++++----------
 configure.ac   |    2 +-
 src/girl-gui.c |    3 +++
 3 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/configure b/configure
index 2397fb8..a6c6b63 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.6.0.
+# Generated by GNU Autoconf 2.69 for girl 9.6.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='9.6.0'
-PACKAGE_STRING='girl 9.6.0'
+PACKAGE_VERSION='9.6.1'
+PACKAGE_STRING='girl 9.6.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1359,7 +1359,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.6.0 to adapt to many kinds of systems.
+\`configure' configures girl 9.6.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1425,7 +1425,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of girl 9.6.0:";;
+     short | recursive ) echo "Configuration of girl 9.6.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1539,7 +1539,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-girl configure 9.6.0
+girl configure 9.6.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1904,7 +1904,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.6.0, which was
+It was created by girl $as_me 9.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2767,7 +2767,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='girl'
- VERSION='9.6.0'
+ VERSION='9.6.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -7221,7 +7221,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.6.0, which was
+This file was extended by girl $as_me 9.6.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -7287,7 +7287,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.6.0
+girl config.status 9.6.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/configure.ac b/configure.ac
index 4cb2ec7..b37d8e9 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.6.0)
+AC_INIT(girl, 9.6.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 b61ec80..9034313 100644
--- a/src/girl-gui.c
+++ b/src/girl-gui.c
@@ -44,6 +44,7 @@
 #include <gtk/gtkcombobox.h>
 #include <glib/gstdio.h>
 #include "girl.h"
+#include "girl-player-frontend.h"
 #include "girl-gui.h"
 #include "girl-program.h"
 #include "girl-station.h"
@@ -514,6 +515,8 @@ on_search_matches(GtkEntryCompletion *widget,
                        girl->selected_station_location,
                        girl->selected_station_uri);
 
+       girl_player_frontend_stop (girl->player_window, NULL);
+
        girl_helper_run(girl->selected_station_uri,
                        girl->selected_station_name,
                        GIRL_STREAM_SHOUTCAST,


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