diff options
| -rw-r--r-- | src/eggaccelerators.c | 4 | ||||
| -rw-r--r-- | src/eggaccelerators.h | 3 | ||||
| -rw-r--r-- | src/tomboykeybinder.c | 6 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/eggaccelerators.c b/src/eggaccelerators.c index 5410259..804615e 100644 --- a/src/eggaccelerators.c +++ b/src/eggaccelerators.c @@ -21,7 +21,11 @@ #include <string.h> #include <gdk/gdkx.h> +#if GTK_CHECK_VERSION(3,0,0) +#include <gdk/gdkkeysyms-compat.h> +#else #include <gdk/gdkkeysyms.h> +#endif enum { diff --git a/src/eggaccelerators.h b/src/eggaccelerators.h index 18e3ae0..1da4a07 100644 --- a/src/eggaccelerators.h +++ b/src/eggaccelerators.h @@ -20,8 +20,7 @@ #ifndef __EGG_ACCELERATORS_H__ #define __EGG_ACCELERATORS_H__ -#include <gtk/gtkaccelgroup.h> -#include <gdk/gdk.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/src/tomboykeybinder.c b/src/tomboykeybinder.c index 7aa7168..29a8e27 100644 --- a/src/tomboykeybinder.c +++ b/src/tomboykeybinder.c @@ -86,7 +86,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); @@ -94,7 +94,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)); } } } @@ -312,7 +312,7 @@ tomboy_keybinder_is_modifier (guint keycode) XModifierKeymap *mod_keymap; gboolean retval = FALSE; - mod_keymap = XGetModifierMapping (gdk_display); + mod_keymap = XGetModifierMapping (gdk_x11_get_default_xdisplay()); map_size = 8 * mod_keymap->max_keypermod; |