summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorDanny Baumann <dannybaumann@web.de>2008-01-31 09:24:32 +0100
committerDanny Baumann <dannybaumann@web.de>2008-01-31 09:24:32 +0100
commit4416007679541a9e144e3b8a5365adeaaddb04c8 (patch)
tree522cb54b56c91d929f1c7237909a600072fef57a /gtk
parent246cf6eb353459d3c666e59419e7d4c7e2679959 (diff)
Make decoration atom names part of the decoration interface.
If those atom names do not match between decorator and decoration plugin, the decorator will be useless; so it makes sense to include them in the interface.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/window-decorator/gtk-window-decorator.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index 0a75dfa8..41ce6ae9 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -2526,9 +2526,9 @@ update_default_decorations (GdkScreen *screen)
xroot = RootWindowOfScreen (gdk_x11_screen_get_xscreen (screen));
- bareAtom = XInternAtom (xdisplay, "_COMPIZ_WINDOW_DECOR_BARE", FALSE);
- normalAtom = XInternAtom (xdisplay, "_COMPIZ_WINDOW_DECOR_NORMAL", FALSE);
- activeAtom = XInternAtom (xdisplay, "_COMPIZ_WINDOW_DECOR_ACTIVE", FALSE);
+ bareAtom = XInternAtom (xdisplay, DECOR_BARE_ATOM_NAME, FALSE);
+ normalAtom = XInternAtom (xdisplay, DECOR_NORMAL_ATOM_NAME, FALSE);
+ activeAtom = XInternAtom (xdisplay, DECOR_ACTIVE_ATOM_NAME, FALSE);
if (no_border_shadow)
{
@@ -6834,12 +6834,11 @@ main (int argc, char *argv[])
gdkscreen = gdk_display_get_default_screen (gdkdisplay);
frame_window_atom = XInternAtom (xdisplay, "_NET_FRAME_WINDOW", FALSE);
- win_decor_atom = XInternAtom (xdisplay, "_COMPIZ_WINDOW_DECOR", FALSE);
- win_blur_decor_atom = XInternAtom (xdisplay, "_COMPIZ_WM_WINDOW_BLUR_DECOR",
- FALSE);
+ win_decor_atom = XInternAtom (xdisplay, DECOR_WINDOW_ATOM_NAME, FALSE);
+ win_blur_decor_atom = XInternAtom (xdisplay, DECOR_BLUR_ATOM_NAME, FALSE);
wm_move_resize_atom = XInternAtom (xdisplay, "_NET_WM_MOVERESIZE", FALSE);
restack_window_atom = XInternAtom (xdisplay, "_NET_RESTACK_WINDOW", FALSE);
- select_window_atom = XInternAtom (xdisplay, "_COMPIZ_SWITCH_SELECT_WINDOW",
+ select_window_atom = XInternAtom (xdisplay, DECOR_SWITCH_WINDOW_ATOM_NAME,
FALSE);
mwm_hints_atom = XInternAtom (xdisplay, "_MOTIF_WM_HINTS", FALSE);