--- gtkhotkey-0.2.1/configure.ac 2009-09-04 04:52:49.000000000 +0800 +++ gtkhotkey-0.2.1-patched/configure.ac 2012-11-18 01:09:08.175757334 +0800 @@ -1,6 +1,8 @@ dnl Process this file with autoconf to produce a configure script. dnl Created by Anjuta application wizard. +AC_PREREQ(2.62) + AC_INIT(gtkhotkey, 0.2.1) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) @@ -45,10 +47,15 @@ AM_PROG_LIBTOOL -PKG_CHECK_MODULES(GTK_HOTKEY, [glib-2.0 >= 2.15.6 gobject-2.0 >= 2.15.6 gio-2.0 >= 2.15.6 gio-unix-2.0 >= 2.15.6 gtk+-2.0 >= 2.12]) +PKG_CHECK_MODULES(GTK_HOTKEY, [glib-2.0 >= 2.15.6 gobject-2.0 >= 2.15.6 gio-2.0 >= 2.15.6 gio-unix-2.0 >= 2.15.6 gtk+-3.0 >= 3.00]) AC_SUBST(GTK_HOTKEY_CFLAGS) AC_SUBST(GTK_HOTKEY_LIBS) +AC_CONFIG_MACRO_DIR([m4]) + + +GOBJECT_INTROSPECTION_CHECK([1.30.0]) + ################################################## diff -r -u -r gtkhotkey-0.2.1/src/gtk-hotkey-info.h gtkhotkey-0.2.1-patched/src/gtk-hotkey-info.h --- gtkhotkey-0.2.1/src/gtk-hotkey-info.h 2009-09-04 04:52:49.000000000 +0800 +++ gtkhotkey-0.2.1-patched/src/gtk-hotkey-info.h 2012-11-18 00:48:49.863793332 +0800 @@ -63,11 +63,9 @@ GAppInfo* gtk_hotkey_info_get_app_info (GtkHotkeyInfo* self); -const gchar* gtk_hotkey_info_get_application_id (GtkHotkeyInfo* self); const gchar* gtk_hotkey_info_get_signature (GtkHotkeyInfo* self); -const gchar* gtk_hotkey_info_get_key_id (GtkHotkeyInfo* self); const gchar* gtk_hotkey_info_get_description (GtkHotkeyInfo* self); @@ -77,6 +75,17 @@ void gtk_hotkey_info_activated (GtkHotkeyInfo* self, guint event_time); +/** + * gtk_hotkey_info_new: + * @app_id: + * @key_id: + * @signature: + * @app_info: (allow-none): + */ + + + + GtkHotkeyInfo* gtk_hotkey_info_new (const gchar *app_id, const gchar *key_id, const gchar *signature, Only in gtkhotkey-0.2.1-patched/src/: gtk-hotkey-info.h~ diff -r -u -r gtkhotkey-0.2.1/src/Makefile.am gtkhotkey-0.2.1-patched/src/Makefile.am --- gtkhotkey-0.2.1/src/Makefile.am 2009-09-04 04:52:49.000000000 +0800 +++ gtkhotkey-0.2.1-patched/src/Makefile.am 2012-11-18 00:39:54.047809162 +0800 @@ -68,3 +68,37 @@ gtk-hotkey-error.h \ gtk-hotkey-utils.c \ gtk-hotkey-utils.h + + +include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) +INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) + +if HAVE_INTROSPECTION + introspection_sources = \ + gtk-hotkey-info.h \ + gtk-hotkey-key-file-registry.h \ + gtk-hotkey-listener.h \ + gtk-hotkey-registry.h \ + gtk-hotkey-x11-listener.h \ + gtk-hotkey-private.h \ + gtk-hotkey-marshal.h \ + gtk-hotkey-error.h \ + gtk-hotkey-utils.h + + GtkHotkey-1.0.gir: libgtkhotkey.la + GtkHotkey_1_0_gir_INCLUDES = Gio-2.0 + GtkHotkey_1_0_gir_CFLAGS = $(INCLUDES) + GtkHotkey_1_0_gir_LIBS = libgtkhotkey.la + GtkHotkey_1_0_gir_FILES = $(introspection_sources) + INTROSPECTION_GIRS += GtkHotkey-1.0.gir + + girdir = $(datadir)/gir-1.0 + gir_DATA = $(INTROSPECTION_GIRS) + + typelibdir = $(libdir)/girepository-1.0 + typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + + CLEANFILES = $(gir_DATA) $(typelib_DATA) +endif Only in gtkhotkey-0.2.1-patched/src/: Makefile.am~ Only in gtkhotkey-0.2.1/src: Makefile.in diff -r -u -r gtkhotkey-0.2.1/src/x11/eggaccelerators.c gtkhotkey-0.2.1-patched/src/x11/eggaccelerators.c --- gtkhotkey-0.2.1/src/x11/eggaccelerators.c 2009-09-04 04:52:49.000000000 +0800 +++ gtkhotkey-0.2.1-patched/src/x11/eggaccelerators.c 2012-11-18 01:14:05.339748554 +0800 @@ -579,20 +579,20 @@ j = 0; while (j < n_entries) { - if (keyvals[j] == GDK_Num_Lock) + if (keyvals[j] == GDK_KEY_Num_Lock) mask |= EGG_VIRTUAL_NUM_LOCK_MASK; - else if (keyvals[j] == GDK_Scroll_Lock) + else if (keyvals[j] == GDK_KEY_Scroll_Lock) mask |= EGG_VIRTUAL_SCROLL_LOCK_MASK; - else if (keyvals[j] == GDK_Meta_L || - keyvals[j] == GDK_Meta_R) + else if (keyvals[j] == GDK_KEY_Meta_L || + keyvals[j] == GDK_KEY_Meta_R) mask |= EGG_VIRTUAL_META_MASK; - else if (keyvals[j] == GDK_Hyper_L || - keyvals[j] == GDK_Hyper_R) + else if (keyvals[j] == GDK_KEY_Hyper_L || + keyvals[j] == GDK_KEY_Hyper_R) mask |= EGG_VIRTUAL_HYPER_MASK; - else if (keyvals[j] == GDK_Super_L || - keyvals[j] == GDK_Super_R) + else if (keyvals[j] == GDK_KEY_Super_L || + keyvals[j] == GDK_KEY_Super_R) mask |= EGG_VIRTUAL_SUPER_MASK; - else if (keyvals[j] == GDK_Mode_switch) + else if (keyvals[j] == GDK_KEY_Mode_switch) mask |= EGG_VIRTUAL_MODE_SWITCH_MASK; ++j; Only in gtkhotkey-0.2.1-patched/src/x11: eggaccelerators.c~ diff -r -u -r gtkhotkey-0.2.1/src/x11/eggaccelerators.h gtkhotkey-0.2.1-patched/src/x11/eggaccelerators.h --- gtkhotkey-0.2.1/src/x11/eggaccelerators.h 2009-09-04 04:52:49.000000000 +0800 +++ gtkhotkey-0.2.1-patched/src/x11/eggaccelerators.h 2012-11-18 01:11:23.419753339 +0800 @@ -21,7 +21,7 @@ #ifndef __EGG_ACCELERATORS_H__ #define __EGG_ACCELERATORS_H__ -#include +#include #include G_BEGIN_DECLS Only in gtkhotkey-0.2.1-patched/src/x11: eggaccelerators.h~ diff -r -u -r gtkhotkey-0.2.1/src/x11/tomboykeybinder.c gtkhotkey-0.2.1-patched/src/x11/tomboykeybinder.c --- gtkhotkey-0.2.1/src/x11/tomboykeybinder.c 2012-11-18 01:23:23.000000000 +0800 +++ gtkhotkey-0.2.1-patched/src/x11/tomboykeybinder.c 2012-11-18 01:20:48.163736651 +0800 @@ -4,7 +4,6 @@ #include #include #include -#include #include #include @@ -72,7 +71,7 @@ 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 +79,7 @@ XUngrabKey (GDK_WINDOW_XDISPLAY (rootwin), binding->keycode, binding->modifiers | mod_masks [i], - GDK_WINDOW_XWINDOW (rootwin)); + GDK_WINDOW_XID (rootwin)); } } } @@ -96,6 +95,7 @@ TRACE (g_print ("Preparing to bind %s\n", binding->keystring)); + g_return_val_if_fail (keymap != NULL, FALSE); g_return_val_if_fail (rootwin != NULL, FALSE); @@ -299,8 +299,9 @@ gint map_size; XModifierKeymap *mod_keymap; gboolean retval = FALSE; + GdkWindow *rootwin = gdk_get_default_root_window (); - mod_keymap = XGetModifierMapping (gdk_display); + mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY(rootwin)); map_size = 8 * mod_keymap->max_keypermod; Only in gtkhotkey-0.2.1-patched/src/x11: tomboykeybinder.c~