From: Benjamin Otte <otte@redhat.com>
Date: Sat, 2 Feb 2013 14:32:23 +0000 (+0100)
Subject: xsettings: Remove unused function
X-Git-Url: http://pileus.org/git/?p=~andy%2Fgtk;a=commitdiff_plain;h=c1a4a1da103ad813fc6c44d786b2b336e5e6ed2c

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 39a112df8..6e082507a 100644
--- 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 fb3dca328..f4b0e3897 100644
--- 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 710ed1248..0e30641cf 100644
--- 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 0577db5d1..277322657 100644
--- 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