diff options
-rw-r--r-- | src/compositor.c | 21 | ||||
-rw-r--r-- | src/theme.c | 1 |
2 files changed, 14 insertions, 8 deletions
diff --git a/src/compositor.c b/src/compositor.c index 4841ab40..c073802d 100644 --- a/src/compositor.c +++ b/src/compositor.c @@ -1286,6 +1286,7 @@ free_win (MetaCompWindow *cw, gboolean destroy) { MetaDisplay *display = cw->screen->display; + MetaCompScreen *info = cw->screen->compositor_data; #ifdef HAVE_NAME_WINDOW_PIXMAP /* See comment in map_win */ @@ -1353,7 +1354,12 @@ free_win (MetaCompWindow *cw, cw->damage = None; } - + + /* The window may not have been added to the list in this case, + but we can check anyway */ + if (cw->type == META_COMP_WINDOW_DOCK) + info->dock_windows = g_slist_remove (info->dock_windows, cw); + g_free (cw); } } @@ -1552,12 +1558,6 @@ add_win (MetaScreen *screen, } get_window_type (display, cw); - if (cw->type == META_COMP_WINDOW_DOCK) - { - g_print ("Appending %p to dock windows\n", cw); - info->dock_windows = g_slist_append (info->dock_windows, cw); - } - /* If Metacity has decided not to manage this window then the input events won't have been set on the window */ event_mask = cw->attrs.your_event_mask | PropertyChangeMask; @@ -1595,6 +1595,13 @@ add_win (MetaScreen *screen, determine_mode (display, screen, cw); cw->needs_shadow = window_has_shadow (cw); + /* Only add the window to the list of docks if it needs a shadow */ + if (cw->type == META_COMP_WINDOW_DOCK && cw->needs_shadow) + { + g_print ("Appending %p to dock windows\n", cw); + info->dock_windows = g_slist_append (info->dock_windows, cw); + } + /* Add this to the list at the top of the stack before it is mapped so that map_win can find it again */ info->windows = g_list_prepend (info->windows, cw); diff --git a/src/theme.c b/src/theme.c index 5cd22f8a..84698591 100644 --- a/src/theme.c +++ b/src/theme.c @@ -2429,7 +2429,6 @@ meta_draw_spec_new (MetaTheme *theme, { gboolean result; - g_print ("%s is constant\n", expr); result = pos_eval (spec, NULL, &spec->value, error); if (result == FALSE) { |