summaryrefslogtreecommitdiff
path: root/plugins/keyboard
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/keyboard')
-rw-r--r--plugins/keyboard/msd-keyboard-manager.c5
-rw-r--r--plugins/keyboard/msd-keyboard-xkb.c8
2 files changed, 0 insertions, 13 deletions
diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c
index 3eef1b2..048d648 100644
--- a/plugins/keyboard/msd-keyboard-manager.c
+++ b/plugins/keyboard/msd-keyboard-manager.c
@@ -35,7 +35,6 @@
#include <glib/gi18n.h>
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
-#include <gtk/gtk.h>
#ifdef HAVE_X11_EXTENSIONS_XF86MISC_H
#include <X11/extensions/xf86misc.h>
@@ -304,11 +303,7 @@ apply_settings (GSettings *settings,
#endif /* HAVE_X11_EXTENSIONS_XKB_H */
XSync (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), FALSE);
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_error_trap_pop_ignored ();
-#else
- gdk_error_trap_pop ();
-#endif
}
void
diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c
index bb62f2b..4f1cf28 100644
--- a/plugins/keyboard/msd-keyboard-xkb.c
+++ b/plugins/keyboard/msd-keyboard-xkb.c
@@ -172,11 +172,7 @@ popup_menu_launch_capplet ()
info = g_app_info_create_from_commandline ("mate-keyboard-properties", NULL, 0, &error);
if (info != NULL) {
-# if GTK_CHECK_VERSION (3, 0, 0)
context = gdk_display_get_app_launch_context (gdk_display_get_default ());
-# else
- context = gdk_app_launch_context_new ();
-# endif
g_app_info_launch (info, NULL,
G_APP_LAUNCH_CONTEXT (context), &error);
@@ -224,11 +220,7 @@ popup_menu_show_layout ()
matekbd_keyboard_drawing_new_dialog (xkl_state->group,
group_names
[xkl_state->group]);
-# if GTK_CHECK_VERSION(3,0,0)
g_signal_connect (dialog, "destroy",
-# else
- g_signal_connect (GTK_OBJECT (dialog), "destroy",
-#endif
G_CALLBACK (show_layout_destroy),
GINT_TO_POINTER (xkl_state->group));
g_hash_table_insert (preview_dialogs,