conky 1.3.3

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

diff --git a/ChangeLog b/ChangeLog
index 4e63c79..16df362 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # $Id$
 
+2005-10-17
+       * Ugly MPD mem leak fixed
+       * Other mem leaks fixed
+       * Fixed thing where conky exits if LC_ALL and friends isn't set
+       * Conky 1.3.3 released
+
 2005-10-13
        * Conky 1.3.2 released
 

diff --git a/README b/README
index 5d341a3..cc342a9 100644 (file)
--- a/README
+++ b/README
@@ -706,6 +706,18 @@ VARIABLES
              Percent of song's progress
 
 
+       mpd_random
+             Random status (On/Off)
+
+
+       mpd_repeat
+             Repeat status (On/Off)
+
+
+       mpd_track
+             Prints the MPD track field
+
+
        new_mails
              Unread mail count in mail spool.
 
@@ -881,4 +893,4 @@ AUTHORS
 
 
 
-                                 2005-09-24                          conky(1)
+                                 2005-10-17                          conky(1)

diff --git a/configure.in b/configure.in
index 14d3a72..b987d8e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
-AC_INIT([Conky],[1.3.1],[brenden1@users.sourceforge.net])
+AC_INIT([Conky],[1.3.2],[brenden1@users.sourceforge.net])
 
-AM_INIT_AUTOMAKE(conky, 1.3.1)
+AM_INIT_AUTOMAKE(conky, 1.3.2)
 AM_CONFIG_HEADER(src/config.h)
 AC_PROG_LIBTOOL
 

diff --git a/doc/docs.xml b/doc/docs.xml
index 17af17d..07a41aa 100644 (file)
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -16,7 +16,7 @@
       <firstname>Brenden</firstname>
       <surname>Matthews</surname>
     </author>
-    <date>2005-09-24</date>
+    <date>2005-10-17</date>
   </refentryinfo>
 
   <refmeta>

diff --git a/doc/variables.xml b/doc/variables.xml
index 5713345..e42444b 100644 (file)
--- a/doc/variables.xml
+++ b/doc/variables.xml
@@ -829,6 +829,33 @@
 
 <varlistentry>
        <term>
+               <command><option>mpd_random</option></command>
+       </term>
+       <listitem>
+               Random status (On/Off)
+       <para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+       <term>
+               <command><option>mpd_repeat</option></command>
+       </term>
+       <listitem>
+               Repeat status (On/Off)
+       <para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+       <term>
+               <command><option>mpd_track</option></command>
+       </term>
+       <listitem>
+               Prints the MPD track field
+       <para></para></listitem>
+</varlistentry>
+
+<varlistentry>
+       <term>
                <command><option>new_mails</option></command>
        </term>
        <listitem>

diff --git a/src/conky.c b/src/conky.c
index 52dc6e1..f82550e 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -4751,7 +4751,6 @@ int main(int argc, char **argv)
        }
        if (!setlocale(LC_CTYPE, "")) {
                ERR("Can't set the specified locale!\nCheck LANG, LC_CTYPE, LC_ALL.");
-               return 1;
        }
 #endif /* X11 */
        while (1) {