* Fixed issue with SIGPIPE and mpd

    * Updated COPYING (with more clarifications)

git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@927 7f574dfc-610e-0410-a909-a81674777703

diff --git a/COPYING b/COPYING
index 35c5bf9..46b9d71 100644 (file)
--- a/COPYING
+++ b/COPYING
@@ -2,7 +2,7 @@ Any original torsmo code is licensed under the BSD license (see LICENSE.BSD
 for a copy)
 
 All code written since the fork of torsmo is licensed under the GPL (see
-LICENSE.GPL for a copy)
+LICENSE.GPL for a copy), except where noted differently (such as in portmon code, timed thread code, and audacious code which are LGPL, and prss which is an MIT-style license).
 
 Copyright (c) 2004, Hannu Saransaari and Lauri Hakkarainen
 Copyright (c) 2005-2007 Brenden Matthews, Philip Kovacs, et. al. (see AUTHORS)

diff --git a/ChangeLog b/ChangeLog
index c2d132e..f421cfe 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 # $Id$
 
+2007-08-27
+       * Fixed issue with SIGPIPE and mpd
+       * Updated COPYING (with more clarifications)
+
 2007-08-14
        * Updated vim/nano syntax files.
 
@@ -9,7 +13,7 @@
 2007-08-12
        * Added var $platform which is similar to $i2c and accommodates the conversion
          of many devices from /sys/bus/i2c/devices to /sys/bus/platform/devices.
-  * Removed config item post_21_kernel since it forced all i2c device lookups
+       * Removed config item post_21_kernel since it forced all i2c device lookups
          to go to /sys/bus/platform/devices and some people may need a mix of both
                i2c and platform devices.
 

diff --git a/src/conky.c b/src/conky.c
index 571d043..a79720d 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -1002,8 +1002,8 @@ enum text_object_type {
        OBJ_alignr,
        OBJ_alignc,
        OBJ_i2c,
-  OBJ_platform,
-  OBJ_hwmon,
+       OBJ_platform,
+       OBJ_hwmon,
 #if defined(__linux__)
        OBJ_i8k_version,
        OBJ_i8k_bios,

diff --git a/src/conky.h b/src/conky.h
index c75caad..6434ddf 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -183,6 +183,7 @@ struct mpd_s {
        int elapsed;
        int max_title_len;              /* e.g. ${mpd_title 50} */
 };
+
 #endif
 
 #ifdef XMMS2

diff --git a/src/mpd.c b/src/mpd.c
index 918ef23..a14beb6 100644 (file)
--- a/src/mpd.c
+++ b/src/mpd.c
@@ -224,5 +224,8 @@ void update_mpd()
                return;
        }
        mpd_freeStatus(status);
-//     mpd_closeConnection(current_info->conn);
+       if (current_info->conn) {
+               mpd_closeConnection(current_info->conn);
+               current_info->conn = 0;
+       }
 }