talons

commit 8daa7c79cf26b723abc221504e1a6fe403790453
parent 33f6746558bc184d2e2a7e92b5dc1d8c007c1068
Author: Andrej Kacian <ticho@claws-mail.org>
Date:   Fri,  9 Feb 2018 21:21:17 +0100

Fix notification plugin's gtkhotkey build with GTK3.

Diffstat:
M
src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
 | 
13
++++++++++---

1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c b/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
@@ -72,7 +72,7 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
 			XGrabKey (GDK_WINDOW_XDISPLAY (rootwin), 
 				  binding->keycode, 
 				  binding->modifiers | mod_masks [i], 
-				  GDK_WINDOW_XWINDOW (rootwin), 
+				  GDK_WINDOW_XID (rootwin),
 				  False, 
 				  GrabModeAsync,
 				  GrabModeAsync);
@@ -80,7 +80,7 @@ grab_ungrab_with_ignorable_modifiers (GdkWindow *rootwin,
 			XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin),
 				    binding->keycode,
 				    binding->modifiers | mod_masks [i], 
-				    GDK_WINDOW_XWINDOW (rootwin));
+				    GDK_WINDOW_XID (rootwin));
 		}
 	}
 }
@@ -299,8 +299,14 @@ tomboy_keybinder_is_modifier (guint keycode)
 	gint map_size;
 	XModifierKeymap *mod_keymap;
 	gboolean retval = FALSE;
+#ifdef GDK_WINDOWING_X11
+	GdkDisplay *gdk_display;
 
-	mod_keymap = XGetModifierMapping (gdk_display);
+	gdk_display = gdk_display_get_default();
+
+	g_return_val_if_fail(gdk_display != NULL, FALSE);
+
+	mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY(gdk_display));
 
 	map_size = 8 * mod_keymap->max_keypermod;
 
@@ -314,6 +320,7 @@ tomboy_keybinder_is_modifier (guint keycode)
 	}
 
 	XFreeModifiermap (mod_keymap);
+#endif
 
 	return retval;
 }