summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorDavid Reveman <davidr@novell.com>2006-12-05 10:18:31 -0500
committerDavid Reveman <davidr@novell.com>2006-12-05 10:18:31 -0500
commit497de229c11416588828b37dd1d041bcb08ea193 (patch)
treedb52901cc41c6cd22a106c5aac8fc77baac2dc9d /gtk
parent7801605dacdc25ea4323129588895f719f8a4662 (diff)
Make sure switcher window isn't added as a normal window.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/window-decorator/gtk-window-decorator.c23
1 files changed, 13 insertions, 10 deletions
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index 09f56212..8bf7db25 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -3557,15 +3557,15 @@ window_opened (WnckScreen *screen,
xid = wnck_window_get_xid (win);
- if (get_window_prop (xid, frame_window_atom, &window))
- {
- add_frame_window (win, window);
- }
- else if (get_window_prop (xid, select_window_atom, &window))
+ if (get_window_prop (xid, select_window_atom, &window))
{
d->prop_xid = wnck_window_get_xid (win);
update_switcher_window (win, window);
}
+ else if (get_window_prop (xid, frame_window_atom, &window))
+ {
+ add_frame_window (win, window);
+ }
}
static void
@@ -4684,12 +4684,15 @@ event_filter_func (GdkXEvent *gdkxevent,
win = wnck_window_get (xid);
if (win)
{
- Window frame;
+ Window frame, window;
- if (get_window_prop (xid, frame_window_atom, &frame))
- add_frame_window (win, frame);
- else
- remove_frame_window (win);
+ if (!get_window_prop (xid, select_window_atom, &window))
+ {
+ if (get_window_prop (xid, frame_window_atom, &frame))
+ add_frame_window (win, frame);
+ else
+ remove_frame_window (win);
+ }
}
}
else if (xevent->xproperty.atom == mwm_hints_atom)