x11: Clean up xsettings header

[~andy/gtk] / gdk / x11 / xsettings-client.h

diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h
index cb6ab9b08233f032255e79304cebb413cdf4dcfc..298950b11dabfcfe23df3081e186ec96aaf619cb 100644 (file)
--- a/gdk/x11/xsettings-client.h
+++ b/gdk/x11/xsettings-client.h
@@ -26,22 +26,15 @@
 #include <gdk/gdkscreen.h>
 #include <X11/Xlib.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 /* Renames for GDK inclusion */
 
 #define xsettings_client_destroy         _gdk_x11_xsettings_client_destroy
 #define xsettings_client_get_setting     _gdk_x11_xsettings_client_get_setting
 #define xsettings_client_new             _gdk_x11_xsettings_client_new
-#define xsettings_client_set_grab_func   _gdk_x11_xsettings_client_set_grab_func
-#define xsettings_client_set_ungrab_func _gdk_x11_xsettings_client_set_ungrab_func
 #define xsettings_client_process_event   _gdk_x11_xsettings_client_process_event
 #define xsettings_setting_equal          _gdk_x11_xsettings_setting_equal
 #define xsettings_setting_free           _gdk_x11_xsettings_setting_free
 
-typedef struct _XSettingsBuffer  XSettingsBuffer;
 typedef struct _XSettingsColor   XSettingsColor;
 typedef struct _XSettingsSetting XSettingsSetting;
 typedef struct _XSettingsClient XSettingsClient;
@@ -63,24 +56,6 @@ typedef enum
   XSETTINGS_ACTION_DELETED
 } XSettingsAction;
 
-typedef enum
-{
-  XSETTINGS_SUCCESS,
-  XSETTINGS_NO_MEM,
-  XSETTINGS_ACCESS,
-  XSETTINGS_FAILED,
-  XSETTINGS_NO_ENTRY,
-  XSETTINGS_DUPLICATE_ENTRY
-} XSettingsResult;
-
-struct _XSettingsBuffer
-{
-  char byte_order;
-  size_t len;
-  unsigned char *data;
-  unsigned char *pos;
-};
-
 struct _XSettingsColor
 {
   unsigned short red, green, blue, alpha;
@@ -106,7 +81,6 @@ typedef Bool (*XSettingsWatchFunc)  (Window            window,
                                     Bool              is_start,
                                     long              mask,
                                     void             *cb_data);
-typedef void (*XSettingsGrabFunc)   (Display          *display);
 
 void              xsettings_setting_free          (XSettingsSetting    *setting);
 int               xsettings_setting_equal         (XSettingsSetting    *setting_a,
@@ -115,13 +89,7 @@ int               xsettings_setting_equal         (XSettingsSetting    *setting_
 XSettingsClient *xsettings_client_new             (GdkScreen           *screen,
                                                   XSettingsNotifyFunc  notify,
                                                   XSettingsWatchFunc   watch,
-                                                  void                *cb_data,
-                                                   XSettingsGrabFunc    grab,
-                                                   XSettingsGrabFunc    ungrab);
-void             xsettings_client_set_grab_func   (XSettingsClient     *client,
-                                                  XSettingsGrabFunc    grab);
-void             xsettings_client_set_ungrab_func (XSettingsClient     *client,
-                                                  XSettingsGrabFunc    ungrab);
+                                                  void                *cb_data);
 void             xsettings_client_destroy         (XSettingsClient     *client);
 Bool             xsettings_client_process_event   (XSettingsClient     *client,
                                                   XEvent              *xev);
@@ -129,8 +97,4 @@ const XSettingsSetting *
                  xsettings_client_get_setting     (XSettingsClient     *client,
                                                   const char          *name);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
 #endif /* XSETTINGS_CLIENT_H */