callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x11: Remove unused argument

Browse Source
This commit is contained in:
Benjamin Otte
2013-02-15 18:02:51 +01:00
parent edf19ab7b4
commit 9ed7e883f2
1 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
gdk/x11/xsettings-client.c
View File

@ -411,14 +411,13 @@ add_events (Display *display,
static Bool static Bool
gdk_xsettings_watch (Window window, gdk_xsettings_watch (Window window,
Bool is_start, Bool is_start,
long mask,
GdkScreen *screen); GdkScreen *screen);
static void static void
check_manager_window (XSettingsClient *client) check_manager_window (XSettingsClient *client)
{ {
if (client->manager_window) if (client->manager_window)
gdk_xsettings_watch (client->manager_window, False, 0, client->screen); gdk_xsettings_watch (client->manager_window, False, client->screen);
gdk_x11_display_grab (gdk_screen_get_display (client->screen)); gdk_x11_display_grab (gdk_screen_get_display (client->screen));
@ -434,9 +433,7 @@ check_manager_window (XSettingsClient *client)
if (client->manager_window) if (client->manager_window)
{ {
if (!gdk_xsettings_watch (client->manager_window, True, if (!gdk_xsettings_watch (client->manager_window, True, client->screen))
PropertyChangeMask | StructureNotifyMask,
client->screen))
{ {
/* Inability to watch the window probably means that it was destroyed /* Inability to watch the window probably means that it was destroyed
* after we ungrabbed * after we ungrabbed
@ -494,7 +491,6 @@ gdk_xsettings_client_event_filter (GdkXEvent *xevent,
static Bool static Bool
gdk_xsettings_watch (Window window, gdk_xsettings_watch (Window window,
Bool is_start, Bool is_start,
long mask,
GdkScreen *screen) GdkScreen *screen)
{ {
GdkWindow *gdkwin; GdkWindow *gdkwin;
@ -571,8 +567,7 @@ xsettings_client_new (GdkScreen *screen)
*/ */
add_events (client->display, gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), StructureNotifyMask); add_events (client->display, gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), StructureNotifyMask);
gdk_xsettings_watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), True, StructureNotifyMask, gdk_xsettings_watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (screen)), True, client->screen);
client->screen);
check_manager_window (client); check_manager_window (client);
@ -582,10 +577,9 @@ xsettings_client_new (GdkScreen *screen)
void void
xsettings_client_destroy (XSettingsClient *client) xsettings_client_destroy (XSettingsClient *client)
{ {
gdk_xsettings_watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (client->screen)), gdk_xsettings_watch (gdk_x11_window_get_xid (gdk_screen_get_root_window (client->screen)), False, client->screen);
False, 0, client->screen);
if (client->manager_window) if (client->manager_window)
gdk_xsettings_watch (client->manager_window, False, 0, client->screen); gdk_xsettings_watch (client->manager_window, False, client->screen);
if (client->settings) if (client->settings)
g_hash_table_unref (client->settings); g_hash_table_unref (client->settings);