make the internal window type more easily inheritable

diff --git a/openbox/focus_cycle_indicator.c b/openbox/focus_cycle_indicator.c
index da5efa563be5157af4e382ac5cad5410798a650c..495a72305be16d2d86d1fe738e4015b2e13b46eb 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.obwin.type = OB_WINDOW_CLASS_INTERNAL;
-    focus_indicator.left.obwin.type = OB_WINDOW_CLASS_INTERNAL;
-    focus_indicator.right.obwin.type = OB_WINDOW_CLASS_INTERNAL;
-    focus_indicator.bottom.obwin.type = OB_WINDOW_CLASS_INTERNAL;
+    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;
 
     attr.override_redirect = True;
     attr.background_pixel = BlackPixel(obt_display, ob_screen);

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