prefixing and capitalizing the StackLayer -> ObStackingLayer enum.

[chaz/openbox] / openbox / event.c

diff --git a/openbox/event.c b/openbox/event.c
index 7c5ab11fee2652427c12e6415f377ac38d7b7557..b6899a8ba89f1731ce214581ead5fb0730900a43 100644 (file)
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -38,8 +38,8 @@
 
 static void event_process(XEvent *e);
 static void event_handle_root(XEvent *e);
-static void event_handle_dock(Dock *s, XEvent *e);
-static void event_handle_dockapp(DockApp *app, XEvent *e);
+static void event_handle_dock(ObDock *s, XEvent *e);
+static void event_handle_dockapp(ObDockApp *app, XEvent *e);
 static void event_handle_client(ObClient *c, XEvent *e);
 static void event_handle_menu(ObClient *c, XEvent *e);
 static void fd_event_handle();
@@ -432,7 +432,7 @@ static gboolean event_ignore(XEvent *e, ObClient *client)
                 g_message("no valid FocusIn and no FocusOut events found, "
                           "falling back");
 #endif
-                focus_fallback(Fallback_NoFocus);
+                focus_fallback(OB_FOCUS_FALLBACK_NOFOCUS);
             }
         }
        break;
@@ -468,8 +468,8 @@ static void event_process(XEvent *e)
 {
     Window window;
     ObClient *client = NULL;
-    Dock *dock = NULL;
-    DockApp *dockapp = NULL;
+    ObDock *dock = NULL;
+    ObDockApp *dockapp = NULL;
     Menu *menu = NULL;
     ObWindow *obwin = NULL;
 
@@ -662,7 +662,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
         /* are we a fullscreen window or a transient of one? (checks layer)
            if we are then we need to be iconified since we are losing focus
          */
-        if (client->layer == Layer_Fullscreen && !client->iconic &&
+        if (client->layer == OB_STACKING_LAYER_FULLSCREEN && !client->iconic &&
             !client_search_focus_tree_full(client))
             /* iconify fullscreen windows when they and their transients
                aren't focused */
@@ -1145,7 +1145,7 @@ static void fd_event_handle()
     g_datalist_foreach(&fd_handler_list, fd_event_handle_foreach, NULL);
 }
 
-static void event_handle_dock(Dock *s, XEvent *e)
+static void event_handle_dock(ObDock *s, XEvent *e)
 {
     switch (e->type) {
     case ButtonPress:
@@ -1160,7 +1160,7 @@ static void event_handle_dock(Dock *s, XEvent *e)
     }
 }
 
-static void event_handle_dockapp(DockApp *app, XEvent *e)
+static void event_handle_dockapp(ObDockApp *app, XEvent *e)
 {
     switch (e->type) {
     case MotionNotify: