From: Derek Foreman <foremande@gmail.com>
Date: Wed, 9 Jun 2010 21:10:37 +0000 (-0400)
Subject: ObInternalWindow now has an ObWindow instead of a type.
X-Git-Tag: cgl~64
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=beeded9d57fc1952807b8d7c86494d521e1a4411;p=dana%2Fopenbox.git

ObInternalWindow now has an ObWindow instead of a type.
---

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index 89527903..c467c3bc 100644
--- 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 77398c5f..e011bf7e 100644
--- 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 9883554d..74b9c082 100644
--- 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;
 };