X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=openbox%2Fevent.c;h=cdac868332602645faa20592fea84995a0ff68e5;hb=fd19711e6a7cdc63f10b79cedc7ff54d7a9d2e81;hp=d80f755c11212fca6420ecbbcbda987dc204c738;hpb=35418ca0fcd3fd28ef579f4435b8bad3b7c87f04;p=chaz%2Fopenbox

diff --git a/openbox/event.c b/openbox/event.c
index d80f755c..cdac8683 100644
--- a/openbox/event.c
+++ b/openbox/event.c
@@ -449,7 +449,7 @@ static void event_process(XEvent *e)
     ObClient *client = NULL;
     ObDock *dock = NULL;
     ObDockApp *dockapp = NULL;
-    Menu *menu = NULL;
+    ObMenu *menu = NULL;
     ObWindow *obwin = NULL;
 
     window = event_get_window(e);
@@ -650,7 +650,7 @@ static void event_handle_client(ObClient *client, XEvent *e)
 	break;
     case EnterNotify:
         if (client_normal(client)) {
-            if (ob_state == OB_STATE_STARTING) {
+            if (ob_state() == OB_STATE_STARTING) {
                 /* move it to the top of the focus order */
                 guint desktop = client->desktop;
                 if (desktop == DESKTOP_ALL) desktop = screen_desktop;
@@ -963,9 +963,9 @@ static void event_handle_client(ObClient *client, XEvent *e)
 
 static void event_handle_menu(ObClient *client, XEvent *e)
 {
-    static MenuEntry *over = NULL;
-    MenuEntry *entry;
-    Menu *top;
+    static ObMenuEntry *over = NULL;
+    ObMenuEntry *entry;
+    ObMenu *top;
     GSList *it;
 
     top = g_slist_nth_data(menu_visible, 0);
@@ -999,7 +999,7 @@ static void event_handle_menu(ObClient *client, XEvent *e)
 	g_message("BUTTON RELEASED");
 
         for (it = menu_visible; it; it = g_slist_next(it)) {
-            Menu *m = it->data;
+            ObMenu *m = it->data;
             if (e->xbutton.x_root >= m->location.x - ob_rr_theme->bwidth &&
                 e->xbutton.y_root >= m->location.y - ob_rr_theme->bwidth &&
                 e->xbutton.x_root < m->location.x + m->size.width +
@@ -1046,7 +1046,7 @@ static void event_handle_menu(ObClient *client, XEvent *e)
     case MotionNotify:
         g_message("motion");
         for (it = menu_visible; it; it = g_slist_next(it)) {
-            Menu *m = it->data;
+            ObMenu *m = it->data;
             if ((entry = menu_find_entry_by_pos(it->data,
                                                 e->xmotion.x_root -
                                                 m->location.x,