stuff

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

diff --git a/Conky.kdevelop b/Conky.kdevelop
index 252cfe5..94dc211 100644 (file)
--- a/Conky.kdevelop
+++ b/Conky.kdevelop
@@ -15,7 +15,7 @@
   <kdevautoproject>
     <general>
       <activetarget>conky</activetarget>
-      <useconfiguration>debug-no-x</useconfiguration>
+      <useconfiguration>debug</useconfiguration>
     </general>
     <run>
       <mainprogram>conky</mainprogram>

diff --git a/conky.c b/conky.c
index effd7e5..d39b90b 100644 (file)
--- a/conky.c
+++ b/conky.c
@@ -3872,7 +3872,9 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, a) == 0)
 
 #ifdef XDBE
                CONF("double_buffer") {
-                       use_xdbe = string_to_bool(value);
+       if (!own_window) {
+               use_xdbe = string_to_bool(value);
+       }
                }
 #endif
 #ifdef X11
@@ -4024,6 +4026,7 @@ else if (strcasecmp(name, a) == 0 || strcasecmp(name, a) == 0)
 #ifdef OWN_WINDOW
                CONF("own_window") {
                        own_window = string_to_bool(value);
+                       use_xdbe = 0;
                }
 #endif
                CONF("stippled_borders") {
@@ -4284,6 +4287,7 @@ int main(int argc, char **argv)
 #ifdef OWN_WINDOW
                case 'o':
                        own_window = 1;
+                       use_xdbe = 0;
                        break;
 #endif
 #ifdef XDBE