xsettings: Remove XSettingsList type

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

diff --git a/gdk/x11/xsettings-common.h b/gdk/x11/xsettings-common.h
index 1e93f84d4dda7780509506b615f47a3e0e81c135..03a601db1d92d4b8d8c6fd629db3a788427edfdd 100644 (file)
--- a/gdk/x11/xsettings-common.h
+++ b/gdk/x11/xsettings-common.h
@@ -23,30 +23,27 @@
 #ifndef XSETTINGS_COMMON_H
 #define XSETTINGS_COMMON_H
 
+#include <glib.h>
+#include <sys/types.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
 /* Renames for GDK inclusion */
 
-#define xsettings_byte_order           _gdk_xsettings_byte_order
-#define xsettings_client_destroy       _gdk_xsettings_client_destroy
-#define xsettings_client_get_setting   _gdk_xsettings_client_get_setting
-#define xsettings_client_new           _gdk_xsettings_client_new
-#define xsettings_client_process_event _gdk_xsettings_client_process_event
-#define xsettings_list_copy            _gdk_xsettings_list_copy
-#define xsettings_list_delete          _gdk_xsettings_list_delete
-#define xsettings_list_free            _gdk_xsettings_list_free
-#define xsettings_list_insert          _gdk_xsettings_list_insert
-#define xsettings_list_lookup          _gdk_xsettings_list_lookup
-#define xsettings_setting_copy         _gdk_xsettings_setting_copy
-#define xsettings_setting_equal        _gdk_xsettings_setting_equal
-#define xsettings_setting_free         _gdk_xsettings_setting_free
-
+#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_copy           _gdk_x11_xsettings_setting_copy
+#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 _XSettingsList    XSettingsList;
 typedef struct _XSettingsSetting XSettingsSetting;
 
 /* Types of settings possible. Enum values correspond to
@@ -82,12 +79,6 @@ struct _XSettingsColor
   unsigned short red, green, blue, alpha;
 };
 
-struct _XSettingsList
-{
-  XSettingsSetting *setting;
-  XSettingsList *next;
-};
-
 struct _XSettingsSetting
 {
   char *name;
@@ -107,17 +98,6 @@ void              xsettings_setting_free  (XSettingsSetting *setting);
 int               xsettings_setting_equal (XSettingsSetting *setting_a,
                                           XSettingsSetting *setting_b);
 
-void              xsettings_list_free   (XSettingsList     *list);
-XSettingsList    *xsettings_list_copy   (XSettingsList     *list);
-XSettingsResult   xsettings_list_insert (XSettingsList    **list,
-                                        XSettingsSetting  *setting);
-XSettingsSetting *xsettings_list_lookup (XSettingsList     *list,
-                                        const char        *name);
-XSettingsResult   xsettings_list_delete (XSettingsList    **list,
-                                        const char        *name);
-
-char xsettings_byte_order (void);
-
 #define XSETTINGS_PAD(n,m) ((n + m - 1) & (~(m-1)))
 
 #ifdef __cplusplus