small fixes, updated ebuild

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

diff --git a/Conky.kdevelop b/Conky.kdevelop
index 3d67520..a932f3f 100644 (file)
--- a/Conky.kdevelop
+++ b/Conky.kdevelop
@@ -9,7 +9,7 @@
     <ignoreparts/>
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description/>
+    <description></description>
     <versioncontrol/>
   </general>
   <kdevautoproject>
@@ -48,21 +48,21 @@
         <f77flags/>
       </optimized>
       <debug>
-        <configargs>--enable-debug=full --prefix=/usr --enable-mpd --enable-xft --enable-seti --enable-double-buffer --enable-own-window --enable-metar --enable-mldonkey --enable-x11</configargs>
+        <configargs>--enable-debug=full --prefix=/usr --enable-mpd --disable-xft --enable-seti --enable-double-buffer --disable-own-window --enable-metar --enable-mldonkey --enable-x11</configargs>
         <builddir>debug</builddir>
         <ccompiler>kdevgccoptions</ccompiler>
         <cxxcompiler>kdevgppoptions</cxxcompiler>
         <f77compiler>kdevpgf77options</f77compiler>
         <cflags>-O2 -Wall -fexceptions -fomit-frame-pointer -fshort-enums -ggdb</cflags>
         <envvars/>
-        <topsourcedir/>
-        <cppflags/>
-        <ldflags/>
-        <ccompilerbinary/>
-        <cxxcompilerbinary/>
-        <f77compilerbinary/>
-        <cxxflags/>
-        <f77flags/>
+        <topsourcedir></topsourcedir>
+        <cppflags></cppflags>
+        <ldflags></ldflags>
+        <ccompilerbinary></ccompilerbinary>
+        <cxxcompilerbinary></cxxcompilerbinary>
+        <f77compilerbinary></f77compilerbinary>
+        <cxxflags></cxxflags>
+        <f77flags></f77flags>
       </debug>
       <debug-no-x>
         <envvars/>
@@ -97,11 +97,11 @@
   <kdevdebugger>
     <general>
       <dbgshell>/usr/bin/libtool</dbgshell>
-      <programargs/>
+      <programargs></programargs>
       <gdbpath>/usr/bin/</gdbpath>
-      <configGdbScript/>
-      <runShellScript/>
-      <runGdbScript/>
+      <configGdbScript></configGdbScript>
+      <runShellScript></runShellScript>
+      <runGdbScript></runGdbScript>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>
       <floatingtoolbar>false</floatingtoolbar>
@@ -182,7 +182,7 @@
       <headerCompletionDelay>250</headerCompletionDelay>
     </codecompletion>
     <creategettersetter>
-      <prefixGet/>
+      <prefixGet></prefixGet>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
       <parameterName>theValue</parameterName>

diff --git a/app-admin/conky/conky-1.9999.ebuild b/app-admin/conky/conky-1.9999.ebuild
index 8398de0..800df66 100644 (file)
--- a/app-admin/conky/conky-1.9999.ebuild
+++ b/app-admin/conky/conky-1.9999.ebuild
@@ -40,7 +40,7 @@ src_compile() {
    econf \
       $(use_enable truetype xft) \
       $(use_enable seti) \
-         $(use_enable x x11) \
+         $(use_enable X x11) \
       --enable-double-buffer \
       --enable-own-window \
       --enable-proc-uptime \

diff --git a/conky.c b/conky.c
index ec0d9a2..a63ed1b 100644 (file)
--- a/conky.c
+++ b/conky.c
@@ -2611,6 +2611,7 @@ static void update_text_area()
                y = workarea[3] - text_height - gap_y;
                break;
        
+#ifdef OWN_WINDOW
        case NONE: // Let the WM manage the window
                x = window.x;
                y = window.y;
@@ -2618,9 +2619,10 @@ static void update_text_area()
                fixed_pos  = 1;
                fixed_size = 1;
                break;
+#endif
        }
-
 #ifdef OWN_WINDOW
+
        if (own_window && !fixed_pos) {
                x += workarea[0];
                y += workarea[1];
@@ -4253,7 +4255,7 @@ int main(int argc, char **argv)
             text_height + border_margin * 2 + 1,
             on_bottom, fixed_pos);
 #else
-       init_winow
+       init_window
                (own_window,
                 text_width + border_margin * 2 + 1,
                 text_height + border_margin * 2 + 1,