x11: Clean up xsettings header

- Don't use defines for renames
- Move enum into only source file using it

diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 1efec10c0e7a7e2d7f437364cf116e3bf1bc3e47..785a24dfca2b9c7b65ae010d1a723d5839174586 100644 (file)
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -135,7 +135,7 @@ _gdk_x11_screen_events_uninit (GdkScreen *screen)
 
   if (x11_screen->xsettings_client)
     {
-      xsettings_client_destroy (x11_screen->xsettings_client);
+      _gdk_x11_xsettings_client_destroy (x11_screen->xsettings_client);
       x11_screen->xsettings_client = NULL;
     }
 }
@@ -1336,7 +1336,7 @@ gdk_x11_screen_get_setting (GdkScreen   *screen,
   GdkX11Screen *x11_screen = GDK_X11_SCREEN (screen);
   const GValue *setting;
 
-  setting = xsettings_client_get_setting (x11_screen->xsettings_client, name);
+  setting = _gdk_x11_xsettings_client_get_setting (x11_screen->xsettings_client, name);
   if (setting == NULL)
     goto out;
 
@@ -1557,7 +1557,7 @@ _gdk_x11_screen_init_events (GdkScreen *screen)
   /* Keep a flag to avoid extra notifies that we don't need
    */
   x11_screen->xsettings_in_init = TRUE;
-  x11_screen->xsettings_client = xsettings_client_new (screen);
+  x11_screen->xsettings_client = _gdk_x11_xsettings_client_new (screen);
   x11_screen->xsettings_in_init = FALSE;
 }
 

diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index 757984a04cebbf18b9dd67bb23d076fe49a9ddd1..78bd0ec8c74aaa3215a2529194bdbf41285902f8 100644 (file)
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -40,6 +40,16 @@
 
 #include "gdksettings.c"
 
+/* Types of settings possible. Enum values correspond to
+ * protocol values.
+ */
+typedef enum 
+{
+  XSETTINGS_TYPE_INT     = 0,
+  XSETTINGS_TYPE_STRING  = 1,
+  XSETTINGS_TYPE_COLOR   = 2
+} XSettingsType;
+
 typedef struct _XSettingsBuffer  XSettingsBuffer;
 
 struct _XSettingsBuffer
@@ -543,7 +553,7 @@ gdk_xsettings_manager_window_filter (GdkXEvent *xevent,
 }
 
 XSettingsClient *
-xsettings_client_new (GdkScreen *screen)
+_gdk_x11_xsettings_client_new (GdkScreen *screen)
 {
   XSettingsClient *client;
   char *selection_atom_name;
@@ -568,7 +578,7 @@ xsettings_client_new (GdkScreen *screen)
 }
 
 void
-xsettings_client_destroy (XSettingsClient *client)
+_gdk_x11_xsettings_client_destroy (XSettingsClient *client)
 {
   gdk_window_remove_filter (gdk_screen_get_root_window (client->screen), gdk_xsettings_root_window_filter, client->screen);
   if (client->manager_window)
@@ -583,8 +593,8 @@ xsettings_client_destroy (XSettingsClient *client)
 }
 
 const GValue *
-xsettings_client_get_setting (XSettingsClient   *client,
-                             const char        *name)
+_gdk_x11_xsettings_client_get_setting (XSettingsClient   *client,
+                                      const char        *name)
 {
   return g_hash_table_lookup (client->settings, name);
 }

diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h
index 9400c2424b095e35f61aae54776f881f6dcdd28f..13920f2bea937ffb6f50cbc5ae2228f0053e0968 100644 (file)
--- a/gdk/x11/xsettings-client.h
+++ b/gdk/x11/xsettings-client.h
@@ -25,27 +25,11 @@
 
 #include <gdk/gdkscreen.h>
 
-/* 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
-
 typedef struct _XSettingsClient XSettingsClient;
 
-/* Types of settings possible. Enum values correspond to
- * protocol values.
- */
-typedef enum 
-{
-  XSETTINGS_TYPE_INT     = 0,
-  XSETTINGS_TYPE_STRING  = 1,
-  XSETTINGS_TYPE_COLOR   = 2
-} XSettingsType;
-
-XSettingsClient *xsettings_client_new             (GdkScreen           *screen);
-void             xsettings_client_destroy         (XSettingsClient     *client);
-const GValue *   xsettings_client_get_setting     (XSettingsClient     *client,
-                                                  const char          *name);
+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 */