A mainly cosmetic update.

One useless "if (own_window)" check was removed. It is already inside another
identical check, and so will always evaluate to true.

One strncmp against the word "dock" was limited to four characters instead of
seven, for consistency with the other checks in the configuration parsing code.

Signed-off-by: Brenden Matthews <brenden@rty.ca>

diff --git a/src/conky.c b/src/conky.c
index 5e67f8d..fc0aa9b 100644 (file)
--- a/src/conky.c
+++ b/src/conky.c
@@ -6932,9 +6932,7 @@ static void main_loop(void)
                                                        window.height = text_height + border_inner_margin * 2 + border_outer_margin * 2 + border_width * 2;
                                                        XResizeWindow(display, window.window, window.width,
                                                                window.height);
-                                                       if (own_window) {
-                                                               set_transparent_background(window.window);
-                                                       }
+                                                       set_transparent_background(window.window);
                                        }
 
                                        /* move window if it isn't in right position */
@@ -8290,7 +8288,7 @@ static void load_config_file(const char *f)
                                        window.type = TYPE_NORMAL;
                                } else if (strncmp(value, "desktop", 7) == EQUAL) {
                                        window.type = TYPE_DESKTOP;
-                               } else if (strncmp(value, "dock", 7) == EQUAL) {
+                               } else if (strncmp(value, "dock", 4) == EQUAL) {
                                        window.type = TYPE_DOCK;
                                        text_alignment = TOP_LEFT;
                                } else if (strncmp(value, "override", 8) == EQUAL) {