on_bottom and wm_class_name deprecated

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

diff --git a/ChangeLog b/ChangeLog
index e2854ec..148efd5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 2006-02-14
        * Drastically simplified own_window=yes window creation code.
+       * on_bottom and wm_class_name deprecated (they do nothing)
 
 2006-02-13
        * Fixed typo bug in portmon code that caused incorrect monitor data 

diff --git a/src/conky.c b/src/conky.c
index 31e3759..80e3c2c 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -5583,22 +5583,12 @@ int main(int argc, char **argv)
 #ifdef X11
        update_text_area();     /* to get initial size of the window */
 
-#if defined OWN_WINDOW
-       init_window
-           (own_window,
-            wm_class_name,
-            text_width + border_margin * 2 + 1,
-            text_height + border_margin * 2 + 1,
-            on_bottom, fixed_pos, set_transparent, background_colour, info.uname_s.nodename);
-#else
        init_window
                (own_window,
                 text_width + border_margin * 2 + 1,
                 text_height + border_margin * 2 + 1,
-                on_bottom, set_transparent, background_colour, info.uname_s.nodename);
+                set_transparent, background_colour, info.uname_s.nodename);
        
-#endif
-
        update_text_area();     /* to position text/window on screen */
 #endif /* X11 */
 

diff --git a/src/conky.h b/src/conky.h
index ab09e2c..25d3560 100644 (file)
--- a/src/conky.h
+++ b/src/conky.h
@@ -337,11 +337,7 @@ extern int workarea[4];
 extern struct conky_window window;
 
 void init_X11();
-#if defined OWN_WINDOW
-void init_window(int use_own_window, char* wm_class_name, int width, int height, int on_bottom, int fixed_pos, int set_trans, int back_colour, char * nodename);
-#else
-void init_window(int use_own_window, int width, int height, int on_bottom, int set_trans, int back_colour, char * nodename);
-#endif
+void init_window(int use_own_window, int width, int height, int set_trans, int back_colour, char * nodename);
 void create_gc();
 void set_transparent_background(Window win);
 long get_x11_color(const char *);

diff --git a/src/x11.c b/src/x11.c
index bf29d45..cbfa509 100644 (file)
--- a/src/x11.c
+++ b/src/x11.c
@@ -173,11 +173,7 @@ inline void set_transparent_background(Window win)
        //XClearWindow(display, win); not sure why this was here
 }
 
-#if defined OWN_WINDOW
-void init_window(int own_window, char* wm_class_name, int w, int h, int l, int fixed_pos, int set_trans, int back_colour, char * nodename)
-#else
-void init_window(int own_window, int w, int h, int l, int set_trans, int back_colour, char * nodename)
-#endif
+void init_window(int own_window, int w, int h, int set_trans, int back_colour, char * nodename)
 {
        /* There seems to be some problems with setting transparent background (on
         * fluxbox this time). It doesn't happen always and I don't know why it
@@ -185,9 +181,6 @@ void init_window(int own_window, int w, int h, int l, int set_trans, int back_co
        set_transparent = set_trans;
        background_colour = back_colour;
 
-       wm_class_name = (char *)wm_class_name;
-       l = (int)l;
-       fixed_pos = (int)fixed_pos;
        nodename = (char *)nodename;
 
 #ifdef OWN_WINDOW