summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJasmine Hassan <[email protected]>2012-12-15 02:28:07 +0200
committerJasmine Hassan <[email protected]>2012-12-15 02:28:07 +0200
commit221c4df4581638c818b37dc4f8ca20fd48122d3f (patch)
treee68ff7f378aed6b0a21a44b8860fc66748cf6847
parent7d37bfdb82681fc8dc27ec80e1df388fe31c0e04 (diff)
downloadmate-settings-daemon-221c4df4581638c818b37dc4f8ca20fd48122d3f.tar.bz2
mate-settings-daemon-221c4df4581638c818b37dc4f8ca20fd48122d3f.tar.xz
[plugins] Fix some deprecations (GTK2/GTK3)
a11y-keyboard: gtk_dialog_set_has_separator(), deprecated in GTK+ 2.22 common|mouse: prefix GDK key constants with _KEY (GTK3)
-rw-r--r--plugins/a11y-keyboard/msd-a11y-preferences-dialog.c1
-rw-r--r--plugins/common/eggaccelerators.c18
-rw-r--r--plugins/common/msd-keygrab.c2
-rw-r--r--plugins/mouse/msd-locate-pointer.c4
4 files changed, 12 insertions, 13 deletions
diff --git a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
index e77900e..72d42ff 100644
--- a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c
@@ -810,7 +810,6 @@ msd_a11y_preferences_dialog_init (MsdA11yPreferencesDialog *dialog)
g_object_unref (builder);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 12);
- gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("Universal Access Preferences"));
gtk_window_set_icon_name (GTK_WINDOW (dialog), "preferences-desktop-accessibility");
g_object_set (dialog,
diff --git a/plugins/common/eggaccelerators.c b/plugins/common/eggaccelerators.c
index 448fb02..171a369 100644
--- a/plugins/common/eggaccelerators.c
+++ b/plugins/common/eggaccelerators.c
@@ -601,20 +601,20 @@ reload_modmap (GdkKeymap *keymap,
mask = 0;
for (j = 0; j < n_entries; ++j)
{
- 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;
}
diff --git a/plugins/common/msd-keygrab.c b/plugins/common/msd-keygrab.c
index c096758..722656b 100644
--- a/plugins/common/msd-keygrab.c
+++ b/plugins/common/msd-keygrab.c
@@ -219,7 +219,7 @@ match_key (Key *key, XEvent *event)
group = XkbGroupForCoreState (event->xkey.state);
else
#endif
- group = (event->xkey.state & GDK_Mode_switch) ? 1 : 0;
+ group = (event->xkey.state & GDK_KEY_Mode_switch) ? 1 : 0;
/* Check if we find a keysym that matches our current state */
if (gdk_keymap_translate_keyboard_state (NULL, event->xkey.keycode,
diff --git a/plugins/mouse/msd-locate-pointer.c b/plugins/mouse/msd-locate-pointer.c
index e304862..f13f7a0 100644
--- a/plugins/mouse/msd-locate-pointer.c
+++ b/plugins/mouse/msd-locate-pointer.c
@@ -380,7 +380,7 @@ filter (GdkXEvent *xevent,
group,
&keyval,
NULL, NULL, NULL);
- if (keyval == GDK_Control_L || keyval == GDK_Control_R)
+ if (keyval == GDK_KEY_Control_L || keyval == GDK_KEY_Control_R)
{
if (xev->type == KeyPress)
{
@@ -417,7 +417,7 @@ set_locate_pointer (void)
int n_screens;
int n_keys;
gboolean has_entries;
- static const guint keyvals[] = { GDK_Control_L, GDK_Control_R };
+ static const guint keyvals[] = { GDK_KEY_Control_L, GDK_KEY_Control_R };
unsigned j;
display = gdk_display_get_default ();