/* 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;
}
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];
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,
#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