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 710ed12482d3251d352bc47a29e8bb8410241772..13920f2bea937ffb6f50cbc5ae2228f0053e0968 100644 (file)
--- a/gdk/x11/xsettings-client.h
+++ b/gdk/x11/xsettings-client.h
@@ -23,57 +23,13 @@
 #ifndef XSETTINGS_CLIENT_H
 #define XSETTINGS_CLIENT_H
 
-#include <X11/Xlib.h>
-#include "xsettings-common.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+#include <gdk/gdkscreen.h>
 
 typedef struct _XSettingsClient XSettingsClient;
 
-typedef enum 
-{
-  XSETTINGS_ACTION_NEW,
-  XSETTINGS_ACTION_CHANGED,
-  XSETTINGS_ACTION_DELETED
-} XSettingsAction;
-
-typedef void (*XSettingsNotifyFunc) (const char       *name,
-                                    XSettingsAction   action,
-                                    XSettingsSetting *setting,
-                                    void             *cb_data);
-typedef Bool (*XSettingsWatchFunc)  (Window            window,
-                                    Bool              is_start,
-                                    long              mask,
-                                    void             *cb_data);
-typedef void (*XSettingsGrabFunc)   (Display          *display);
-
-XSettingsClient *xsettings_client_new             (Display             *display,
-                                                  int                  screen,
-                                                  XSettingsNotifyFunc  notify,
-                                                  XSettingsWatchFunc   watch,
-                                                  void                *cb_data);
-XSettingsClient *xsettings_client_new_with_grab_funcs (Display             *display,
-                                                      int                  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             xsettings_client_destroy         (XSettingsClient     *client);
-Bool             xsettings_client_process_event   (XSettingsClient     *client,
-                                                  XEvent              *xev);
-XSettingsResult  xsettings_client_get_setting     (XSettingsClient     *client,
-                                                  const char          *name,
-                                                  XSettingsSetting   **setting);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+XSettingsClient *_gdk_x11_xsettings_client_new             (GdkScreen           *screen);
+void             _gdk_x11_xsettings_client_destroy         (XSettingsClient     *client);
+const GValue *   _gdk_x11_xsettings_client_get_setting     (XSettingsClient     *client,
+                                                           const char          *name);
 
 #endif /* XSETTINGS_CLIENT_H */