make the window.h interface more consistent with the rest of openbox, hide the window_map behind some functions, and make obdockapps not obwindows anymore

1 files changed, 5 insertions, 5 deletions

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index 98998c88..e4cf5c10 100644
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -98,7 +98,7 @@ void focus_cycle_popup_startup(gboolean reconfig)
 
     single_popup = icon_popup_new();
 
-    popup.obwin.type = Window_Internal;
+    popup.obwin.type = OB_WINDOW_CLASS_INTERNALWINDOW;
     popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
     popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
     popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
@@ -127,16 +127,16 @@ void focus_cycle_popup_startup(gboolean reconfig)
 
     XMapWindow(obt_display, popup.text);
 
-    stacking_add(INTERNAL_AS_WINDOW(&popup));
-    g_hash_table_insert(window_map, &popup.bg, &popup);
+    stacking_add(INTERNALWINDOW_AS_WINDOW(&popup));
+    window_add(&popup.bg, INTERNALWINDOW_AS_WINDOW(&popup));
 }
 
 void focus_cycle_popup_shutdown(gboolean reconfig)
 {
     icon_popup_free(single_popup);
 
-    g_hash_table_remove(window_map, &popup.bg);
-    stacking_remove(INTERNAL_AS_WINDOW(&popup));
+    window_remove(popup.bg);
+    stacking_remove(INTERNALWINDOW_AS_WINDOW(&popup));
 
     while(popup.targets) {
         ObFocusCyclePopupTarget *t = popup.targets->data;