Multiple changes to reduce the amount of unprefixed symbols

The X11 backend exports a number of symbols which are _-prefixed
(so don't become part of the gdk api), but are not named in a
way to prevent accidental clashes between backends.

The one API change here is that the gdk_xid_table functions
have been removed - they did not server an purpose, since the
xid table only stores windows anyway, and we already have a
lookup-by-xid function for windows.

1 files changed, 16 insertions, 16 deletions

diff --git a/gdk/x11/xsettings-common.h b/gdk/x11/xsettings-common.h
index de7367a6c2..dcd87f4fa4 100644
--- a/gdk/x11/xsettings-common.h
+++ b/gdk/x11/xsettings-common.h
@@ -31,22 +31,22 @@ extern "C" {
 
 /* 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_new_with_grab_funcs _gdk_xsettings_client_new_with_grab_funcs
-#define xsettings_client_set_grab_func   _gdk_xsettings_client_set_grab_func
-#define xsettings_client_set_ungrab_func _gdk_xsettings_client_set_ungrab_func
-#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_byte_order             _gdk_x11_xsettings_byte_order
+#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_new_with_grab_funcs _gdk_x11_xsettings_client_new_with_grab_funcs
+#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_list_copy              _gdk_x11_xsettings_list_copy
+#define xsettings_list_delete            _gdk_x11_xsettings_list_delete
+#define xsettings_list_free              _gdk_x11_xsettings_list_free
+#define xsettings_list_insert            _gdk_x11_xsettings_list_insert
+#define xsettings_list_lookup            _gdk_x11_xsettings_list_lookup
+#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;