ObInternalWindow now has an ObWindow instead of a type.

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 895279037eb2fce32d1e13c6d9636cfb5fd92c20..c467c3bc16f3a2a47c696eebe788adae21097001 100644 (file)
--- a/openbox/focus_cycle_indicator.c
+++ b/openbox/focus_cycle_indicator.c
@@ -59,10 +59,10 @@ void focus_cycle_indicator_startup(gboolean reconfig)
 
     if (reconfig) return;
 
-    focus_indicator.top.type = OB_WINDOW_CLASS_INTERNAL;
-    focus_indicator.left.type = OB_WINDOW_CLASS_INTERNAL;
-    focus_indicator.right.type = OB_WINDOW_CLASS_INTERNAL;
-    focus_indicator.bottom.type = OB_WINDOW_CLASS_INTERNAL;
+    focus_indicator.top.super.type = OB_WINDOW_CLASS_INTERNAL;
+    focus_indicator.left.super.type = OB_WINDOW_CLASS_INTERNAL;
+    focus_indicator.right.super.type = OB_WINDOW_CLASS_INTERNAL;
+    focus_indicator.bottom.super.type = OB_WINDOW_CLASS_INTERNAL;
 
     attr.override_redirect = True;
     attr.background_pixel = BlackPixel(obt_display, ob_screen);

diff --git a/openbox/prompt.c b/openbox/prompt.c
index 77398c5fa7ba01c006e28d97fdaa081ab934dcfc..e011bf7e3b66823a50c1035904c56e3d051abbeb 100644 (file)
--- a/openbox/prompt.c
+++ b/openbox/prompt.c
@@ -159,7 +159,7 @@ ObPrompt* prompt_new(const gchar *msg, const gchar *title,
     self->data = data;
     self->default_result = default_result;
     self->cancel_result = cancel_result;
-    self->super.type = OB_WINDOW_CLASS_PROMPT;
+    self->super.super.type = OB_WINDOW_CLASS_PROMPT;
     self->super.window = XCreateWindow(obt_display, obt_root(ob_screen),
                                        0, 0, 1, 1, 0,
                                        CopyFromParent, InputOutput,

diff --git a/openbox/window.h b/openbox/window.h
index 9883554dfef2202867361b8b785661fad6aa13ec..74b9c08215506b49ea9921b21cf34d9e56c2220e 100644 (file)
--- a/openbox/window.h
+++ b/openbox/window.h
@@ -95,7 +95,7 @@ void      window_remove(Window xwin);
 
 /* Internal openbox-owned windows like the alt-tab popup */
 struct _ObInternalWindow {
-    ObWindowClass type;
+    ObWindow super;
     Window window;
 };