diff options
| author | Stefano Karapetsas <[email protected]> | 2014-01-24 16:17:17 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-01-24 16:17:17 +0100 |
| commit | 1893a77af55cd2e87e4e249193a9203b1a7a0c69 (patch) | |
| tree | 33996864ed575f1d4615b3872cb39575bd62c18e /capplets | |
| parent | 6e619aedc2e6a105d5849519ae50e9d2b1145c88 (diff) | |
| download | mate-control-center-1893a77af55cd2e87e4e249193a9203b1a7a0c69.tar.bz2 mate-control-center-1893a77af55cd2e87e4e249193a9203b1a7a0c69.tar.xz | |
keybindings: Add GTK3 support
Diffstat (limited to 'capplets')
| -rw-r--r-- | capplets/keybindings/eggaccelerators.c | 4 | ||||
| -rw-r--r-- | capplets/keybindings/eggcellrendererkeys.c | 7 | ||||
| -rw-r--r-- | capplets/keybindings/mate-keybinding-properties.c | 3 | ||||
| -rw-r--r-- | capplets/keybindings/mate-keybinding-properties.ui | 2 |
4 files changed, 14 insertions, 2 deletions
diff --git a/capplets/keybindings/eggaccelerators.c b/capplets/keybindings/eggaccelerators.c index 9806e109..c81c567e 100644 --- a/capplets/keybindings/eggaccelerators.c +++ b/capplets/keybindings/eggaccelerators.c @@ -26,6 +26,10 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> +#if GTK_CHECK_VERSION (3, 0, 0) +#include <gdk/gdkkeysyms-compat.h> +#endif + enum { EGG_MODMAP_ENTRY_SHIFT = 0, EGG_MODMAP_ENTRY_LOCK = 1, diff --git a/capplets/keybindings/eggcellrendererkeys.c b/capplets/keybindings/eggcellrendererkeys.c index 5d84c2de..9dffeda7 100644 --- a/capplets/keybindings/eggcellrendererkeys.c +++ b/capplets/keybindings/eggcellrendererkeys.c @@ -3,6 +3,9 @@ #include <gtk/gtk.h> #include <gdk/gdkx.h> #include <gdk/gdkkeysyms.h> +#if GTK_CHECK_VERSION (3, 0, 0) +#include <gdk/gdkkeysyms-compat.h> +#endif #include "eggcellrendererkeys.h" #include "eggaccelerators.h" @@ -317,7 +320,11 @@ static gboolean is_modifier(guint keycode) XModifierKeymap* mod_keymap; gboolean retval = FALSE; +#if GTK_CHECK_VERSION (3, 0, 0) + mod_keymap = XGetModifierMapping(gdk_x11_display_get_xdisplay(gdk_display_get_default())); +#else mod_keymap = XGetModifierMapping(gdk_display); +#endif map_size = 8 * mod_keymap->max_keypermod; i = 0; diff --git a/capplets/keybindings/mate-keybinding-properties.c b/capplets/keybindings/mate-keybinding-properties.c index da017f17..3f2d5924 100644 --- a/capplets/keybindings/mate-keybinding-properties.c +++ b/capplets/keybindings/mate-keybinding-properties.c @@ -12,6 +12,9 @@ #include <X11/Xatom.h> #include <glib/gi18n.h> #include <gdk/gdkkeysyms.h> +#if GTK_CHECK_VERSION (3, 0, 0) +#include <gdk/gdkkeysyms-compat.h> +#endif #include "wm-common.h" #include "capplet-util.h" diff --git a/capplets/keybindings/mate-keybinding-properties.ui b/capplets/keybindings/mate-keybinding-properties.ui index 3e9c0498..51090b5a 100644 --- a/capplets/keybindings/mate-keybinding-properties.ui +++ b/capplets/keybindings/mate-keybinding-properties.ui @@ -6,7 +6,6 @@ <property name="border_width">5</property> <property name="title" translatable="yes">Keyboard Shortcuts</property> <property name="type_hint">normal</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="shortcut_dialog"> <property name="visible">True</property> @@ -169,7 +168,6 @@ <object class="GtkDialog" id="custom-shortcut-dialog"> <property name="title" translatable="yes">Custom Shortcut</property> <property name="type_hint">dialog</property> - <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> |