merge gtk3 branch into master

[claws.git] / src / plugins / notification / gtkhotkey / x11 / tomboykeybinder.c

diff --git a/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c b/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
index 18019bf0b45bbbebf63caaacef9c2f8a23aff9f1..2bf6f0defb5dba81e393675bb6c29fc9ffb015e3 100644 (file)
--- a/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
+++ b/src/plugins/notification/gtkhotkey/x11/tomboykeybinder.c
@@ -73,7 +73,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);
@@ -81,7 +81,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));
                }
        }
 }
@@ -300,8 +300,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;
 
@@ -315,6 +321,7 @@ tomboy_keybinder_is_modifier (guint keycode)
        }
 
        XFreeModifiermap (mod_keymap);
+#endif
 
        return retval;
 }