move the code for tracking what extensions are available on the display into the...

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 025dd1297e6e6011d61b4584c2cfc65e4c5a29f3..20ccfe3d22cb1b399f18616cd5318707447b858b 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -26,7 +26,6 @@
 #include "ping.h"
 #include "place.h"
 #include "prop.h"
-#include "extensions.h"
 #include "frame.h"
 #include "session.h"
 #include "event.h"
@@ -1262,7 +1261,7 @@ static void client_get_shaped(ObClient *self)
 {
     self->shaped = FALSE;
 #ifdef   SHAPE
-    if (extensions_shape) {
+    if (obt_display_extension_shape) {
         gint foo;
         guint ufoo;
         gint s;
@@ -3639,8 +3638,8 @@ gboolean client_focus(ObClient *self)
     obt_display_ignore_errors(ob_display, FALSE);
 
     ob_debug_type(OB_DEBUG_FOCUS, "Error focusing? %d\n",
-                  obt_display_error_occured());
-    return !obt_display_error_occured();
+                  obt_display_error_occured);
+    return !obt_display_error_occured;
 }
 
 static void client_present(ObClient *self, gboolean here, gboolean raise,