xsettings: Remove unused function

Remove xsettings_client_new() and rename
xsettings_client_new_with_grab_funcs() to xsettings_client_new()

diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index 39a112df833a62f4bdfb4216dc89892622507dc2..6e082507a6a92566384e15b8e6b4a977a5563d74 100644 (file)
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -1736,13 +1736,13 @@ _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_with_grab_funcs (x11_screen->xdisplay,
-                                                                      x11_screen->screen_num,
-                                                                      gdk_xsettings_notify_cb,
-                                                                      gdk_xsettings_watch_cb,
-                                                                      screen,
-                                                                       refcounted_grab_server,
-                                                                       refcounted_ungrab_server);
+  x11_screen->xsettings_client = xsettings_client_new (x11_screen->xdisplay,
+                                                      x11_screen->screen_num,
+                                                      gdk_xsettings_notify_cb,
+                                                      gdk_xsettings_watch_cb,
+                                                      screen,
+                                                       refcounted_grab_server,
+                                                       refcounted_ungrab_server);
   x11_screen->xsettings_in_init = FALSE;
 }
 

diff --git a/gdk/x11/xsettings-client.c b/gdk/x11/xsettings-client.c
index fb3dca3284b5401823c0cc7cd8227b4a2dfeccbb..f4b0e3897e6fbbf15268fd4ffba94e18f2974008 100644 (file)
--- a/gdk/x11/xsettings-client.c
+++ b/gdk/x11/xsettings-client.c
@@ -450,20 +450,9 @@ xsettings_client_new (Display             *display,
                      int                  screen,
                      XSettingsNotifyFunc  notify,
                      XSettingsWatchFunc   watch,
-                     void                *cb_data)
-{
-  return xsettings_client_new_with_grab_funcs (display, screen, notify, watch, cb_data,
-                                               NULL, NULL);
-}
-
-XSettingsClient *
-xsettings_client_new_with_grab_funcs (Display             *display,
-                                     int                  screen,
-                                     XSettingsNotifyFunc  notify,
-                                     XSettingsWatchFunc   watch,
-                                     void                *cb_data,
-                                     XSettingsGrabFunc    grab,
-                                     XSettingsGrabFunc    ungrab)
+                     void                *cb_data,
+                     XSettingsGrabFunc    grab,
+                     XSettingsGrabFunc    ungrab)
 {
   XSettingsClient *client;
   char buffer[256];

diff --git a/gdk/x11/xsettings-client.h b/gdk/x11/xsettings-client.h
index 710ed12482d3251d352bc47a29e8bb8410241772..0e30641cf5048aef293ab7bb1a4f555c6a4d3c3c 100644 (file)
--- a/gdk/x11/xsettings-client.h
+++ b/gdk/x11/xsettings-client.h
@@ -53,14 +53,9 @@ 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                *cb_data,
+                                                   XSettingsGrabFunc    grab,
+                                                   XSettingsGrabFunc    ungrab);
 void             xsettings_client_set_grab_func   (XSettingsClient     *client,
                                                   XSettingsGrabFunc    grab);
 void             xsettings_client_set_ungrab_func (XSettingsClient     *client,

diff --git a/gdk/x11/xsettings-common.h b/gdk/x11/xsettings-common.h
index 0577db5d1e418c15a6afa91ff55eb332059f41ca..2773226574364ee39b64058b0fd804000850908e 100644 (file)
--- a/gdk/x11/xsettings-common.h
+++ b/gdk/x11/xsettings-common.h
@@ -36,7 +36,6 @@ extern "C" {
 #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