summaryrefslogtreecommitdiff
path: root/maximus
diff options
context:
space:
mode:
authormonsta <[email protected]>2016-11-23 22:25:19 +0300
committermonsta <[email protected]>2016-11-23 22:25:19 +0300
commiteed121741ae9127dac854e865210e733b008c7e9 (patch)
treeeac0f25030edca96008ac42bd257b00970e76af3 /maximus
parentb9e04a89438db9e98d1a6fe9287bedef9ebaab24 (diff)
downloadmate-netbook-eed121741ae9127dac854e865210e733b008c7e9.tar.bz2
mate-netbook-eed121741ae9127dac854e865210e733b008c7e9.tar.xz
move to GTK+3 (>= 3.14), drop GTK+2 code and --with-gtk build option
and require mate-panel >= 1.17
Diffstat (limited to 'maximus')
-rw-r--r--maximus/main.c4
-rw-r--r--maximus/maximus-app.c4
-rw-r--r--maximus/tomboykeybinder.c4
3 files changed, 0 insertions, 12 deletions
diff --git a/maximus/main.c b/maximus/main.c
index 644ceca..b271cd2 100644
--- a/maximus/main.c
+++ b/maximus/main.c
@@ -91,11 +91,7 @@ gint main (gint argc, gchar *argv[])
gdk_error_trap_push ();
app = maximus_app_get_default ();
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_error_trap_pop_ignored ();
-#else
- gdk_error_trap_pop ();
-#endif
gtk_main ();
diff --git a/maximus/maximus-app.c b/maximus/maximus-app.c
index f6ee627..a08278b 100644
--- a/maximus/maximus-app.c
+++ b/maximus/maximus-app.c
@@ -481,11 +481,7 @@ on_app_undecorate_changed (GSettings *settings,
wnck_window_unmaximize (window);
wnck_window_maximize (window);
gdk_flush ();
-#if GTK_CHECK_VERSION (3, 0, 0)
gdk_error_trap_pop_ignored ();
-#else
- gdk_error_trap_pop ();
-#endif
sleep (1);
}
diff --git a/maximus/tomboykeybinder.c b/maximus/tomboykeybinder.c
index e84a586..8607082 100644
--- a/maximus/tomboykeybinder.c
+++ b/maximus/tomboykeybinder.c
@@ -309,11 +309,7 @@ tomboy_keybinder_is_modifier (guint keycode)
XModifierKeymap *mod_keymap;
gboolean retval = FALSE;
-#if GTK_CHECK_VERSION (3, 0, 0)
mod_keymap = XGetModifierMapping (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-#else
- mod_keymap = XGetModifierMapping (gdk_display);
-#endif
map_size = 8 * mod_keymap->max_keypermod;