if sm is disabled, there is nothing to shutdown, so don't go trying to free things...

[chaz/openbox] / openbox / extensions.h

diff --git a/openbox/extensions.h b/openbox/extensions.h
index cc13ecb91ce2695420c01e89822ff4868488dd77..a097957f405b997256b430434b0466eb63c4bb91 100644 (file)
--- a/openbox/extensions.h
+++ b/openbox/extensions.h
@@ -1,6 +1,7 @@
 /* -*- indent-tabs-mode: nil; tab-width: 4; c-basic-offset: 4; -*-
 
    extensions.h for the Openbox window manager
+   Copyright (c) 2006        Mikael Magnusson
    Copyright (c) 2003        Ben Jansens
 
    This program is free software; you can redistribute it and/or modify
@@ -35,36 +36,28 @@
 #ifdef    XRANDR
 #include <X11/extensions/Xrandr.h>
 #endif
-#ifdef    VIDMODE
-#include <X11/extensions/xf86vmode.h>
-#endif
 
 #include <glib.h>
 
 /*! Does the display have the XKB extension? */
 extern gboolean extensions_xkb;
 /*! Base for events for the XKB extension */
-extern int extensions_xkb_event_basep;
+extern gint extensions_xkb_event_basep;
 
 /*! Does the display have the Shape extension? */
 extern gboolean extensions_shape;
 /*! Base for events for the Shape extension */
-extern int extensions_shape_event_basep;
+extern gint extensions_shape_event_basep;
 
 /*! Does the display have the Xinerama extension? */
 extern gboolean extensions_xinerama;
 /*! Base for events for the Xinerama extension */
-extern int extensions_xinerama_event_basep;
+extern gint extensions_xinerama_event_basep;
 
 /*! Does the display have the RandR extension? */
 extern gboolean extensions_randr;
 /*! Base for events for the Randr extension */
-extern int extensions_randr_event_basep;
-
-/*! Does the display have the VidMode extension? */
-extern gboolean extensions_vidmode;
-/*! Base for events for the VidMode extension */
-extern int extensions_vidmode_event_basep;
+extern gint extensions_randr_event_basep;
 
 void extensions_query_all();