undo the disabling of double-buffer when using own_window. this doesn't play well...

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

diff --git a/README b/README
index 88314e2..bfa79fb 100644 (file)
--- a/README
+++ b/README
@@ -35,7 +35,7 @@ COMPILING
        sh autogen.sh # Only required if building from CVS
 
        ./configure           --prefix=/usr            --mandir=/usr/share/man
-       --infodir=/usr/share/info   --datadir=/usr/   share   --sysconfdir=/etc
+       --infodir=/usr/share/info    --datadir=/usr/share     --sysconfdir=/etc
        --localstatedir=/var/lib          --enable-double-buffer   --enable-own-window
        --enable-proc-uptime --enable-mpd --enable-xft --enable-seti
 

diff --git a/doc/docs.xml b/doc/docs.xml
index 44db1f0..f777984 100644 (file)
--- a/doc/docs.xml
+++ b/doc/docs.xml
@@ -74,7 +74,7 @@
                                <term>
                                <command><option>./configure </option></command><option>
 --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info
---datadir=/usr/ share --sysconfdir=/etc --localstatedir=/var/lib 
+--datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib 
 --enable-double-buffer --enable-own-window --enable-proc-uptime 
 --enable-mpd --enable-xft --enable-seti</option>
                                </term>

diff --git a/src/conky.c b/src/conky.c
index 7e4cd66..8190ff0 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -3977,9 +3977,7 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, a) == 0)
 
 #ifdef XDBE
                CONF("double_buffer") {
-       if (!own_window) {
                use_xdbe = string_to_bool(value);
-       }
                }
 #endif
 #ifdef X11
@@ -4138,9 +4136,6 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, a) == 0)
 #ifdef OWN_WINDOW
                CONF("own_window") {
                        own_window = string_to_bool(value);
-#ifdef XDBE
-                       use_xdbe = 0;
-#endif
                }
                CONF("own_window_transparent") {
                        set_transparent = string_to_bool(value);
@@ -4390,16 +4385,11 @@ int main(int argc, char **argv)
 #ifdef OWN_WINDOW
                case 'o':
                        own_window = 1;
-#ifdef XDBE
-                       use_xdbe = 0;
-#endif
                        break;
 #endif
 #ifdef XDBE
                case 'b':
-                       if (!own_window) {
                                use_xdbe = 1;
-                       }
                        break;
 #endif
 #endif /* X11 */