require GTK+ 3.22 and GLib 2.50

author: monsta <[email protected]> 2018-01-31 09:46:08 +0300
committer: monsta <[email protected]> 2018-01-31 09:46:08 +0300
commit: ab7987701bcea97e4326fecd161c3137080f6077 (patch)
tree: 3e49c11405cc69fab4b8a10ba4342cf70078d22a /mate-panel
parent: f553591e0562fd7b4bba0fe6a6182bc0b3747a34 (diff)
download: mate-panel-ab7987701bcea97e4326fecd161c3137080f6077.tar.bz2
mate-panel-ab7987701bcea97e4326fecd161c3137080f6077.tar.xz
21 files changed, 25 insertions, 523 deletions
diff --git a/mate-panel/applet.c b/mate-panel/applet.c
index 13f31d7e..92ec8762 100644
--- a/mate-panel/applet.c
+++ b/mate-panel/applet.c
@@ -651,13 +651,10 @@ mate_panel_applet_position_menu (GtkMenu *menu,
 gtk_widget_get_preferred_size (GTK_WIDGET (menu), &requisition, NULL);
 
 gdk_window_get_origin (gtk_widget_get_window (applet), &menu_x, &menu_y);
-#if GTK_CHECK_VERSION(3, 20, 0)
+
 device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (applet)));
 gdk_window_get_device_position (gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL);
-#else
- device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (applet)));
- gdk_window_get_device_position (gtk_widget_get_window (applet), device, &pointer_x, &pointer_y, NULL);
-#endif
+
 gtk_widget_get_allocation (applet, &allocation);
 
 if (!gtk_widget_get_has_window (applet)) {
diff --git a/mate-panel/button-widget.c b/mate-panel/button-widget.c
index e3f0fa63..94d031f0 100644
--- a/mate-panel/button-widget.c
+++ b/mate-panel/button-widget.c
@@ -415,29 +415,11 @@ button_widget_draw (GtkWidget *widget,
 }
 
 if (gtk_widget_has_focus (widget)) {
-#if !GTK_CHECK_VERSION (3, 20, 0)
- gint focus_pad;
-#endif
-
 gtk_style_context_save (context);
 gtk_style_context_set_state (context, state_flags);
 
-#if !GTK_CHECK_VERSION (3, 20, 0)
- gtk_widget_style_get (widget,
- "focus-padding", &focus_pad,
- NULL);
- x = focus_pad;
- y = focus_pad;
- w = width - 2 * focus_pad;
- h = height - 2 * focus_pad;
-#endif
-
 cairo_save (cr);
-#if GTK_CHECK_VERSION (3, 20, 0)
 gtk_render_focus (context, cr, 0, 0, width, height);
-#else
- gtk_render_focus (context, cr, x, y, w, h);
-#endif
 cairo_restore (cr);
 
 gtk_style_context_restore (context);
diff --git a/mate-panel/launcher.c b/mate-panel/launcher.c
index 07e52e40..d8d65ad1 100644
--- a/mate-panel/launcher.c
+++ b/mate-panel/launcher.c
@@ -540,7 +540,6 @@ create_launcher (const char *location)
 return launcher;
 }
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
 static void
 setup_actions (Launcher *launcher)
 {
@@ -569,7 +568,6 @@ setup_actions (Launcher *launcher)
 
 g_object_unref (app_info);
 }
-#endif
 
 static void
 setup_button (Launcher *launcher)
@@ -590,9 +588,7 @@ setup_button (Launcher *launcher)
 _("_Launch"),
 NULL);
 
-#if GLIB_CHECK_VERSION (2, 38, 0)
 setup_actions (launcher);
-#endif
 
 mate_panel_applet_add_callback (launcher->info,
 "properties",
diff --git a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
index e9657648..006bdb0a 100644
--- a/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
+++ b/mate-panel/libmate-panel-applet-private/panel-applet-frame-dbus.c
@@ -381,10 +381,8 @@ mate_panel_applet_frame_dbus_class_init (MatePanelAppletFrameDBusClass *class)
 frame_class->change_size = mate_panel_applet_frame_dbus_change_size;
 frame_class->change_background = mate_panel_applet_frame_dbus_change_background;
 
-#if GTK_CHECK_VERSION (3, 20, 0)
 GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
 gtk_widget_class_set_css_name (widget_class, "MatePanelAppletFrameDBus");
-#endif
 
 g_type_class_add_private (class, sizeof (MatePanelAppletFrameDBusPrivate));
 }
diff --git a/mate-panel/libpanel-util/panel-show.c b/mate-panel/libpanel-util/panel-show.c
index a4c7f6d7..19feac90 100644
--- a/mate-panel/libpanel-util/panel-show.c
+++ b/mate-panel/libpanel-util/panel-show.c
@@ -177,11 +177,9 @@ gboolean panel_show_uri(GdkScreen* screen, const gchar* uri, guint32 timestamp,
 {
 return panel_show_caja_search_uri(screen, uri, timestamp, error);
 }
-#if GTK_CHECK_VERSION (3, 22, 0)
+
 gtk_show_uri_on_window (NULL, uri,timestamp, &local_error);
-#else
- gtk_show_uri(screen, uri, timestamp, &local_error);
-#endif
+
 return _panel_show_handle_error(uri, screen, local_error, error);
 }
 
@@ -284,11 +282,8 @@ panel_show_help (GdkScreen *screen,
 uri = g_strdup_printf ("help:%s/%s", doc, link);
 else
 uri = g_strdup_printf ("help:%s", doc);
-#if GTK_CHECK_VERSION (3, 22, 0)
+
 gtk_show_uri_on_window (NULL, uri, gtk_get_current_event_time (), &local_error);
-#else
- gtk_show_uri (screen, uri, gtk_get_current_event_time (), &local_error);
-#endif
 g_free (uri);
 
 return _panel_show_help_handle_error (doc, screen, local_error, error);
diff --git a/mate-panel/menu.c b/mate-panel/menu.c
index 6b2858f1..43695bb8 100644
--- a/mate-panel/menu.c
+++ b/mate-panel/menu.c
@@ -424,44 +424,15 @@ grab_widget (GtkWidget *widget)
 
 GdkWindow *window;
 GdkDisplay *display;
-#if GTK_CHECK_VERSION (3, 20, 0)
 GdkSeat *seat;
-#else
- GdkDeviceManager *device_manager;
- GdkDevice *pointer;
- GdkDevice *keyboard;
-#endif
 
 window = gtk_widget_get_window (widget);
 display = gdk_window_get_display (window);
 
-#if GTK_CHECK_VERSION (3, 20, 0)
 seat = gdk_display_get_default_seat (display);
 gdk_seat_grab (seat, window,
 GDK_SEAT_CAPABILITY_ALL, TRUE,
 NULL, NULL, NULL, NULL);
-#else
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
- keyboard = gdk_device_get_associated_device (pointer);
-
- if (gdk_device_grab (pointer, window,
- GDK_OWNERSHIP_WINDOW, TRUE,
- GDK_SMOOTH_SCROLL_MASK |
- GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
- GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
- GDK_POINTER_MOTION_MASK,
- NULL, GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) {
- return;
- }
-
- if (gdk_device_grab (keyboard, window,
- GDK_OWNERSHIP_WINDOW, TRUE,
- GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK,
- NULL, GDK_CURRENT_TIME) != GDK_GRAB_SUCCESS) {
- gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
- }
-#endif
 }
 
 static void
@@ -779,12 +750,8 @@ setup_menuitem (GtkWidget *menuitem,
 
 gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), menuitem);
 
-#if GTK_CHECK_VERSION (3, 16, 0)
 gtk_label_set_xalign (GTK_LABEL (label), 0.0);
 gtk_label_set_yalign (GTK_LABEL (label), 0.5);
-#else
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-#endif
 gtk_widget_show (label);
 
 gtk_container_add (GTK_CONTAINER (menuitem), label);
diff --git a/mate-panel/panel-addto.c b/mate-panel/panel-addto.c
index 825e1e67..49296882 100644
--- a/mate-panel/panel-addto.c
+++ b/mate-panel/panel-addto.c
@@ -1254,12 +1254,8 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
 gtk_box_pack_start (GTK_BOX (inner_vbox), find_hbox, FALSE, FALSE, 0);
 
 dialog->label = gtk_label_new_with_mnemonic ("");
-#if GTK_CHECK_VERSION (3, 16, 0)
 gtk_label_set_xalign (GTK_LABEL (dialog->label), 0.0);
 gtk_label_set_yalign (GTK_LABEL (dialog->label), 0.5);
-#else
- gtk_misc_set_alignment (GTK_MISC (dialog->label), 0.0, 0.5);
-#endif
 gtk_label_set_use_markup (GTK_LABEL (dialog->label), TRUE);
 
 gtk_box_pack_start (GTK_BOX (find_hbox), dialog->label,
diff --git a/mate-panel/panel-applet-frame.c b/mate-panel/panel-applet-frame.c
index 933afc14..a78b8c88 100644
--- a/mate-panel/panel-applet-frame.c
+++ b/mate-panel/panel-applet-frame.c
@@ -123,11 +123,7 @@ mate_panel_applet_frame_draw (GtkWidget *widget,
 "background-image", &bg_pattern,
 NULL);
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 background = &frame->priv->panel->toplevel->background;
-#else
- background = &frame->priv->panel->background;
-#endif
 if (bg_pattern && (background->type == PANEL_BACK_IMAGE ||
 (background->type == PANEL_BACK_COLOR && background->has_alpha))) {
 cairo_matrix_t ptm;
@@ -172,11 +168,8 @@ mate_panel_applet_frame_update_background_size (MatePanelAppletFrame *frame,
 old_allocation->width == new_allocation->width &&
 old_allocation->height == new_allocation->height)
 return;
-#if GTK_CHECK_VERSION (3, 18, 0)
+
 background = &frame->priv->panel->toplevel->background;
-#else
- background = &frame->priv->panel->background;
-#endif
 if (background->type == PANEL_BACK_NONE ||
 (background->type == PANEL_BACK_COLOR && !background->has_alpha))
 return;
@@ -385,12 +378,7 @@ mate_panel_applet_frame_button_changed (GtkWidget *widget,
 MatePanelAppletFrame *frame;
 gboolean handled = FALSE;
 GdkDisplay *display;
-#if GTK_CHECK_VERSION (3, 20, 0)
 GdkSeat *seat;
-#else
- GdkDevice *pointer;
- GdkDeviceManager *device_manager;
-#endif
 
 frame = MATE_PANEL_APPLET_FRAME (widget);
 
@@ -419,16 +407,9 @@ mate_panel_applet_frame_button_changed (GtkWidget *widget,
 case 3:
 if (event->type == GDK_BUTTON_PRESS ||
 event->type == GDK_2BUTTON_PRESS) {
-#if GTK_CHECK_VERSION(3, 20, 0)
 display = gtk_widget_get_display (widget);
 seat = gdk_display_get_default_seat (display);
 gdk_seat_ungrab (seat);
-#else
- display = gtk_widget_get_display (widget);
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
- gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
-#endif
 
 MATE_PANEL_APPLET_FRAME_GET_CLASS (frame)->popup_menu (frame,
 event->button,
@@ -550,11 +531,7 @@ mate_panel_applet_frame_change_background (MatePanelAppletFrame *frame,
 
 if (frame->priv->has_handle) {
 PanelBackground *background;
-#if GTK_CHECK_VERSION (3, 18, 0)
 background = &PANEL_WIDGET (parent)->toplevel->background;
-#else
- background = &PANEL_WIDGET (parent)->background;
-#endif
 panel_background_apply_css (background, GTK_WIDGET (frame));
 }
 
@@ -645,11 +622,7 @@ _mate_panel_applet_frame_update_flags (MatePanelAppletFrame *frame,
 * it */
 PanelBackground *background;
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 background = &frame->priv->panel->toplevel->background;
-#else
- background = &frame->priv->panel->background;
-#endif
 mate_panel_applet_frame_change_background (frame, background->type);
 }
 }
@@ -705,11 +678,8 @@ _mate_panel_applet_frame_get_background_string (MatePanelAppletFrame *frame,
 break;
 }
 }
-#if GTK_CHECK_VERSION (3, 18, 0)
+
 return panel_background_make_string (&panel->toplevel->background, x, y);
-#else
- return panel_background_make_string (&panel->background, x, y);
-#endif
 }
 
 static void
diff --git a/mate-panel/panel-ditem-editor.c b/mate-panel/panel-ditem-editor.c
index 5d66ad65..77addfb8 100644
--- a/mate-panel/panel-ditem-editor.c
+++ b/mate-panel/panel-ditem-editor.c
@@ -503,12 +503,8 @@ label_new_with_mnemonic (const char *text)
 g_free (bold);
 
 gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
-#if GTK_CHECK_VERSION (3, 16, 0)
 gtk_label_set_xalign (GTK_LABEL (label), 1.0);
 gtk_label_set_yalign (GTK_LABEL (label), 0.5);
-#else
- gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
-#endif
 
 gtk_widget_show (label);
 
diff --git a/mate-panel/panel-force-quit.c b/mate-panel/panel-force-quit.c
index de8febce..fdd19438 100644
--- a/mate-panel/panel-force-quit.c
+++ b/mate-panel/panel-force-quit.c
@@ -105,13 +105,8 @@ remove_popup (GtkWidget *popup)
 {
 GdkWindow *root;
 GdkDisplay *display;
-#if GTK_CHECK_VERSION (3, 20, 0)
 GdkSeat *seat;
-#else
- GdkDevice *pointer;
- GdkDevice *keyboard;
- GdkDeviceManager *device_manager;
-#endif
+
 root = gdk_screen_get_root_window (
 gtk_window_get_screen (GTK_WINDOW (popup)));
 gdk_window_remove_filter (root, (GdkFilterFunc) popup_filter, popup);
@@ -119,18 +114,9 @@ remove_popup (GtkWidget *popup)
 gtk_widget_destroy (popup);
 
 display = gdk_window_get_display (root);
-#if GTK_CHECK_VERSION (3, 20, 0)
 seat = gdk_display_get_default_seat (display);
 
 gdk_seat_ungrab (seat);
-#else
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
- keyboard = gdk_device_get_associated_device (pointer);
-
- gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
- gdk_device_ungrab (keyboard, GDK_CURRENT_TIME);
-#endif
 }
 
 static gboolean
@@ -331,11 +317,7 @@ panel_force_quit (GdkScreen *screen,
 GdkDisplay *display;
 GdkDevice *pointer;
 GdkDevice *keyboard;
-#if GTK_CHECK_VERSION (3, 20, 0)
 GdkSeat *seat;
-#else
- GdkDeviceManager *device_manager;
-#endif
 
 popup = display_popup_window (screen);
 
@@ -345,13 +327,8 @@ panel_force_quit (GdkScreen *screen,
 cross = gdk_cursor_new_for_display (gdk_display_get_default (),
 GDK_CROSS);
 display = gdk_window_get_display (root);
-#if GTK_CHECK_VERSION (3, 20, 0)
 seat = gdk_display_get_default_seat (display);
 pointer = gdk_seat_get_pointer (seat);
-#else
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
-#endif
 keyboard = gdk_device_get_associated_device (pointer);
 
 status = gdk_device_grab (pointer, root,
diff --git a/mate-panel/panel-frame.c b/mate-panel/panel-frame.c
index ca395520..a99a810b 100644
--- a/mate-panel/panel-frame.c
+++ b/mate-panel/panel-frame.c
@@ -340,9 +340,8 @@ panel_frame_class_init (PanelFrameClass *klass)
 widget_class->get_preferred_width = panel_frame_get_preferred_width;
 widget_class->get_preferred_height = panel_frame_get_preferred_height;
 widget_class->draw = panel_frame_expose;
-#if GTK_CHECK_VERSION (3, 20, 0)
+
 gtk_widget_class_set_css_name (widget_class, "PanelFrame");
-#endif
 
 g_object_class_install_property (
 gobject_class,
diff --git a/mate-panel/panel-menu-bar.c b/mate-panel/panel-menu-bar.c
index c8ffa76c..955e9c4b 100644
--- a/mate-panel/panel-menu-bar.c
+++ b/mate-panel/panel-menu-bar.c
@@ -270,11 +270,7 @@ static void panel_menu_bar_size_allocate(GtkWidget* widget, GtkAllocation* alloc
 return;
 }
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 background = &PANEL_MENU_BAR(widget)->priv->panel->toplevel->background;
-#else
- background = &PANEL_MENU_BAR(widget)->priv->panel->background;
-#endif
 if (background->type == PANEL_BACK_NONE || (background->type == PANEL_BACK_COLOR && !background->has_alpha))
 {
 return;
@@ -434,11 +430,7 @@ void panel_menu_bar_popup_menu(PanelMenuBar* menubar, guint32 activate_time)
 
 void panel_menu_bar_change_background(PanelMenuBar* menubar)
 {
-#if GTK_CHECK_VERSION (3, 18, 0)
 panel_background_apply_css(&menubar->priv->panel->toplevel->background, GTK_WIDGET(menubar));
-#else
- panel_background_apply_css(&menubar->priv->panel->background, GTK_WIDGET(menubar));
-#endif
 }
 
 static void set_item_text_gravity(GtkWidget* item)
@@ -468,12 +460,8 @@ static void set_item_text_angle_and_alignment(GtkWidget* item, double text_angle
 
 gtk_label_set_angle (GTK_LABEL (label), text_angle);
 
-#if GTK_CHECK_VERSION (3, 16, 0)
 gtk_label_set_xalign (GTK_LABEL (label), xalign);
 gtk_label_set_yalign (GTK_LABEL (label), yalign);
-#else
- gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign);
-#endif
 }
 
 static void panel_menu_bar_update_orientation(PanelMenuBar* menubar)
diff --git a/mate-panel/panel-multiscreen.c b/mate-panel/panel-multiscreen.c
index d085413f..d2e43862 100644
--- a/mate-panel/panel-multiscreen.c
+++ b/mate-panel/panel-multiscreen.c
@@ -202,27 +202,17 @@ panel_multiscreen_get_gdk_monitors_for_screen (GdkScreen *screen,
 int *monitors_ret,
 GdkRectangle **geometries_ret)
 {
-#if GTK_CHECK_VERSION (3, 22, 0)
 GdkDisplay *display;
-#endif
 int num_monitors;
 GdkRectangle *geometries;
 int i;
 
-#if GTK_CHECK_VERSION (3, 22, 0)
 display = gdk_screen_get_display (screen);
 num_monitors = gdk_display_get_n_monitors (display);
-#else
- num_monitors = gdk_screen_get_n_monitors (screen);
-#endif
 geometries = g_new (GdkRectangle, num_monitors);
 
 for (i = 0; i < num_monitors; i++)
-#if GTK_CHECK_VERSION (3, 22, 0)
 gdk_monitor_get_geometry (gdk_display_get_monitor (display, i), &(geometries[i]));
-#else
- gdk_screen_get_monitor_geometry (screen, i, &(geometries[i]));
-#endif
 
 *monitors_ret = num_monitors;
 *geometries_ret = geometries;
diff --git a/mate-panel/panel-profile.c b/mate-panel/panel-profile.c
index 41e1dba6..15cf114e 100644
--- a/mate-panel/panel-profile.c
+++ b/mate-panel/panel-profile.c
@@ -534,11 +534,7 @@ panel_profile_load_background (PanelToplevel *toplevel)
 
 panel_widget = panel_toplevel_get_panel_widget (toplevel);
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 background = &panel_widget->toplevel->background;
-#else
- background = &panel_widget->background;
-#endif
 background_type = panel_profile_get_background_type (toplevel);
 
 get_background_color (toplevel, &color);
@@ -822,11 +818,8 @@ panel_profile_background_change_notify (GSettings *settings,
 if (panel_widget == NULL)
 return;
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 background = &panel_widget->toplevel->background;
-#else
- background = &panel_widget->background;
-#endif
+
 if (!strcmp (key, "type")) {
 PanelBackgroundType background_type;
 background_type = g_settings_get_enum (settings, key);
diff --git a/mate-panel/panel-separator.c b/mate-panel/panel-separator.c
index 5982196a..ce6e6454 100644
--- a/mate-panel/panel-separator.c
+++ b/mate-panel/panel-separator.c
@@ -154,11 +154,8 @@ panel_separator_size_allocate (GtkWidget *widget,
 old_allocation.width == allocation->width &&
 old_allocation.height == allocation->height)
 return;
-#if GTK_CHECK_VERSION (3, 18, 0)
+
 background = &PANEL_SEPARATOR (widget)->priv->panel->toplevel->background;
-#else
- background = &PANEL_SEPARATOR (widget)->priv->panel->background;
-#endif
 if (background->type == PANEL_BACK_NONE ||
 (background->type == PANEL_BACK_COLOR && !background->has_alpha))
 return;
@@ -192,9 +189,7 @@ panel_separator_class_init (PanelSeparatorClass *klass)
 widget_class->size_allocate = panel_separator_size_allocate;
 widget_class->parent_set = panel_separator_parent_set;
 
-#if GTK_CHECK_VERSION (3, 20, 0)
 gtk_widget_class_set_css_name (widget_class, "PanelSeparator");
-#endif
 
 g_type_class_add_private (klass, sizeof (PanelSeparator));
 }
@@ -279,9 +274,5 @@ panel_separator_create (PanelToplevel *toplevel,
 void
 panel_separator_change_background (PanelSeparator *separator)
 {
-#if GTK_CHECK_VERSION (3, 18, 0)
 panel_background_apply_css(&separator->priv->panel->toplevel->background, GTK_WIDGET(separator));
-#else
- panel_background_apply_css(&separator->priv->panel->background, GTK_WIDGET(separator));
-#endif
 }
diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c
index 42b09d35..d6d8fda7 100644
--- a/mate-panel/panel-toplevel.c
+++ b/mate-panel/panel-toplevel.c
@@ -454,14 +454,8 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
 GdkCursorType cursor_type;
 GdkCursor *cursor;
 GdkDisplay *display;
-#if GTK_CHECK_VERSION (3, 20, 0)
 GdkSeat *seat;
 GdkSeatCapabilities capabilities;
-#else
- GdkDevice *pointer;
- GdkDevice *keyboard;
- GdkDeviceManager *device_manager;
-#endif
 
 if (toplevel->priv->state != PANEL_STATE_NORMAL ||
 toplevel->priv->grab_op != PANEL_GRAB_OP_NONE)
@@ -518,7 +512,6 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
 cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
 cursor_type);
 display = gdk_window_get_display (window);
-#if GTK_CHECK_VERSION(3, 20, 0)
 seat = gdk_display_get_default_seat (display);
 capabilities = GDK_SEAT_CAPABILITY_POINTER;
 if (grab_keyboard)
@@ -528,37 +521,14 @@ static void panel_toplevel_begin_grab_op(PanelToplevel* toplevel, PanelGrabOpTyp
 NULL, NULL, NULL);
 
 g_object_unref (cursor);
-#else
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
- keyboard = gdk_device_get_associated_device (pointer);
-
- gdk_device_grab (pointer, window,
- GDK_OWNERSHIP_NONE, FALSE,
- GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
- cursor, time_);
-
- g_object_unref (cursor);
-
- if (grab_keyboard)
- gdk_device_grab (keyboard, window,
- GDK_OWNERSHIP_NONE, FALSE,
- GDK_KEY_PRESS | GDK_KEY_RELEASE,
- NULL, time_);
-#endif
 }
 
 static void panel_toplevel_end_grab_op (PanelToplevel* toplevel, guint32 time_)
 {
 GtkWidget *widget;
 GdkDisplay *display;
-#if GTK_CHECK_VERSION (3, 20, 0)
 GdkSeat *seat;
-#else
- GdkDevice *pointer;
- GdkDevice *keyboard;
- GdkDeviceManager *device_manager;
-#endif
+
 g_return_if_fail (toplevel->priv->grab_op != PANEL_GRAB_OP_NONE);
 
 widget = GTK_WIDGET (toplevel);
@@ -569,18 +539,9 @@ static void panel_toplevel_end_grab_op (PanelToplevel* toplevel, guint32 time_)
 gtk_grab_remove (widget);
 
 display = gtk_widget_get_display (widget);
-#if GTK_CHECK_VERSION(3, 20, 0)
 seat = gdk_display_get_default_seat (display);
 
 gdk_seat_ungrab (seat);
-#else
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
- keyboard = gdk_device_get_associated_device (pointer);
-
- gdk_device_ungrab (pointer, time_);
- gdk_device_ungrab (keyboard, time_);
-#endif
 }
 
 static void panel_toplevel_cancel_grab_op(PanelToplevel* toplevel, guint32 time_)
@@ -884,13 +845,8 @@ static gboolean panel_toplevel_warp_pointer_increment(PanelToplevel* toplevel, i
 
 screen = gtk_window_get_screen (GTK_WINDOW (toplevel));
 root_window = gdk_screen_get_root_window (screen);
-#if GTK_CHECK_VERSION(3, 20, 0)
 device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (GTK_WIDGET(root_window))));
 gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (root_window)), device, &new_x, &new_y, NULL);
-#else
- device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (GTK_WIDGET(root_window))));
- gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (root_window)), device, &new_x, &new_y, NULL);
-#endif
 
 switch (keyval) {
 case GDK_KEY_Up:
@@ -1374,23 +1330,13 @@ static gboolean panel_toplevel_contains_pointer(PanelToplevel* toplevel)
 GdkDisplay *display;
 GdkScreen *screen;
 GtkWidget *widget;
-#if GTK_CHECK_VERSION(3, 20, 0)
 GdkSeat *seat;
 GdkDevice *pointer;
-#else
- GdkDeviceManager *device_manager;
- GdkDevice *pointer;
-#endif
 int x, y;
 
 display = gdk_display_get_default ();
-#if GTK_CHECK_VERSION(3, 20, 0)
 seat = gdk_display_get_default_seat (display);
 pointer = gdk_seat_get_pointer (seat);
-#else
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
-#endif
 widget = GTK_WIDGET (toplevel);
 
 if (!gtk_widget_get_realized (widget))
@@ -2247,11 +2193,8 @@ panel_toplevel_update_position (PanelToplevel *toplevel)
 * x = 1 => outer bevel => x = 0 => no outer bevel = > x = 1 => ...
 * FIXME: maybe the real bug is that we enter into this loop (see bug
 * #160748 to learn how to reproduce.) */
-#if GTK_CHECK_VERSION (3, 18, 0)
 background = &toplevel->background;
-#else
- background = &toplevel->priv->panel_widget->background;
-#endif
+
 /* There's no bevels with a color/image background */
 if (panel_background_effective_type (background) == PANEL_BACK_NONE) {
 GtkStyleContext *context;
@@ -2301,10 +2244,6 @@ calculate_minimum_height (GtkWidget *widget,
 GtkBorder padding;
 PangoContext *pango_context;
 PangoFontMetrics *metrics;
-#if !GTK_CHECK_VERSION (3, 20, 0)
- int focus_width = 0;
- int focus_pad = 0;
-#endif
 int ascent;
 int descent;
 int thickness;
@@ -2324,22 +2263,11 @@ calculate_minimum_height (GtkWidget *widget,
 
 pango_font_metrics_unref (metrics);
 
-#if !GTK_CHECK_VERSION (3, 20, 0)
- gtk_widget_style_get (widget,
- "focus-line-width", &focus_width,
- "focus-padding", &focus_pad,
- NULL);
-#endif
-
 thickness = orientation & PANEL_HORIZONTAL_MASK ?
 padding.top + padding.bottom :
 padding.left + padding.right;
 
-#if GTK_CHECK_VERSION (3, 20, 0)
 return PANGO_PIXELS (ascent + descent) + thickness;
-#else
- return PANGO_PIXELS (ascent + descent) + 2 * (focus_width + focus_pad) + thickness;
-#endif
 }
 
 static int
@@ -2995,7 +2923,6 @@ panel_toplevel_initially_hide (PanelToplevel *toplevel)
 toplevel->priv->initial_animation_done = TRUE;
 }
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 static void
 set_background_default_style (GtkWidget *widget)
 {
@@ -3027,12 +2954,10 @@ set_background_default_style (GtkWidget *widget)
 if (bg_image)
 cairo_pattern_destroy (bg_image);
 }
-#endif
 
 static void
 panel_toplevel_realize (GtkWidget *widget)
 {
-#if GTK_CHECK_VERSION (3, 18, 0)
 PanelToplevel *toplevel;
 GdkScreen *screen;
 GdkVisual *visual;
@@ -3048,25 +2973,16 @@ panel_toplevel_realize (GtkWidget *widget)
 
 gtk_widget_set_visual (widget, visual);
 gtk_window_stick (GTK_WINDOW (widget));
-#else
- PanelToplevel *toplevel = (PanelToplevel *) widget;
- GdkWindow *window;
-#endif
 gtk_window_set_decorated (GTK_WINDOW (widget), FALSE);
 gtk_window_stick (GTK_WINDOW (widget));
 gtk_window_set_type_hint (GTK_WINDOW (widget), GDK_WINDOW_TYPE_HINT_DOCK);
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 GTK_WIDGET_CLASS (panel_toplevel_parent_class)->realize (widget);
-#else
- if (GTK_WIDGET_CLASS (panel_toplevel_parent_class)->realize)
- GTK_WIDGET_CLASS (panel_toplevel_parent_class)->realize (widget);
-#endif
+
 window = gtk_widget_get_window (widget);
-#if GTK_CHECK_VERSION (3, 18, 0)
 set_background_default_style (widget);
 panel_background_realized (&toplevel->background, window);
-#endif
+
 panel_struts_set_window_hint (toplevel);
 
 gdk_window_set_group (window, window);
@@ -3096,18 +3012,11 @@ panel_toplevel_disconnect_timeouts (PanelToplevel *toplevel)
 static void
 panel_toplevel_unrealize (GtkWidget *widget)
 {
-#if GTK_CHECK_VERSION (3, 18, 0)
 PanelToplevel *toplevel;
 toplevel = PANEL_TOPLEVEL (widget);
 panel_toplevel_disconnect_timeouts (toplevel);
 panel_background_unrealized (&toplevel->background);
 GTK_WIDGET_CLASS (panel_toplevel_parent_class)->unrealize (widget);
-#else
- panel_toplevel_disconnect_timeouts (PANEL_TOPLEVEL (widget));
-
- if (GTK_WIDGET_CLASS (panel_toplevel_parent_class)->unrealize)
- GTK_WIDGET_CLASS (panel_toplevel_parent_class)->unrealize (widget);
-#endif
 }
 
 static void
@@ -3215,7 +3124,6 @@ panel_toplevel_get_preferred_height (GtkWidget *widget,
 *minimum_height = *natural_height = req.height;
 }
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 static void
 set_background_region (PanelToplevel *toplevel)
 {
@@ -3246,7 +3154,6 @@ set_background_region (PanelToplevel *toplevel)
 origin_x, origin_y,
 allocation.width, allocation.height);
 }
-#endif
 
 static void
 panel_toplevel_size_allocate (GtkWidget *widget,
@@ -3321,9 +3228,7 @@ panel_toplevel_size_allocate (GtkWidget *widget,
 if (child && gtk_widget_get_visible (child))
 gtk_widget_size_allocate (child, &challoc);
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 set_background_region (toplevel);
-#endif
 }
 
 static gboolean panel_toplevel_draw(GtkWidget* widget, cairo_t* cr)
@@ -3483,7 +3388,7 @@ panel_toplevel_button_release_event (GtkWidget *widget,
 
 return TRUE;
 }
-#if GTK_CHECK_VERSION (3, 18, 0)
+
 static gboolean
 panel_toplevel_configure_event (GtkWidget *widget,
 GdkEventConfigure *event)
@@ -3496,7 +3401,6 @@ panel_toplevel_configure_event (GtkWidget *widget,
 
 return TRUE;
 }
-#endif
 
 static gboolean
 panel_toplevel_key_press_event (GtkWidget *widget,
@@ -3514,7 +3418,6 @@ panel_toplevel_key_press_event (GtkWidget *widget,
 return FALSE;
 }
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 static void
 panel_toplevel_state_flags_changed (GtkWidget *widget,
 GtkStateFlags previous_state)
@@ -3524,7 +3427,6 @@ panel_toplevel_state_flags_changed (GtkWidget *widget,
 
 set_background_default_style (widget);
 }
-#endif
 
 static gboolean
 panel_toplevel_motion_notify_event (GtkWidget *widget,
@@ -4011,9 +3913,7 @@ panel_toplevel_style_updated (GtkWidget *widget)
 if (GTK_WIDGET_CLASS (panel_toplevel_parent_class)->style_updated)
 GTK_WIDGET_CLASS (panel_toplevel_parent_class)->style_updated (widget);
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 set_background_default_style (widget);
-#endif
 }
 
 static void
@@ -4283,9 +4183,8 @@ panel_toplevel_finalize (GObject *object)
 G_CALLBACK (panel_toplevel_drag_threshold_changed),
 toplevel);
 toplevel->priv->gtk_settings = NULL;
-#if GTK_CHECK_VERSION (3, 18, 0)
+
 panel_background_free (&toplevel->background);
-#endif
 }
 
 if (toplevel->priv->attached) {
@@ -4327,9 +4226,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
 
 widget_class->realize = panel_toplevel_realize;
 widget_class->unrealize = panel_toplevel_unrealize;
-#if GTK_CHECK_VERSION (3, 18, 0)
 widget_class->state_flags_changed = panel_toplevel_state_flags_changed;
-#endif
 widget_class->draw = panel_toplevel_draw;
 widget_class->get_preferred_width = panel_toplevel_get_preferred_width;
 widget_class->get_preferred_height = panel_toplevel_get_preferred_height;
@@ -4337,9 +4234,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
 widget_class->size_allocate = panel_toplevel_size_allocate;
 widget_class->button_press_event = panel_toplevel_button_press_event;
 widget_class->button_release_event = panel_toplevel_button_release_event;
-#if GTK_CHECK_VERSION (3, 18, 0)
 widget_class->configure_event = panel_toplevel_configure_event;
-#endif
 widget_class->key_press_event = panel_toplevel_key_press_event;
 widget_class->motion_notify_event = panel_toplevel_motion_notify_event;
 widget_class->enter_notify_event = panel_toplevel_enter_notify_event;
@@ -4348,9 +4243,7 @@ panel_toplevel_class_init (PanelToplevelClass *klass)
 widget_class->focus_in_event = panel_toplevel_focus_in_event;
 widget_class->focus_out_event = panel_toplevel_focus_out_event;
 
-#if GTK_CHECK_VERSION (3, 20, 0)
 gtk_widget_class_set_css_name (widget_class, "PanelToplevel");
-#endif
 
 container_class->check_resize = panel_toplevel_check_resize;
 
@@ -4750,7 +4643,6 @@ panel_toplevel_setup_widgets (PanelToplevel *toplevel)
 gtk_widget_show (toplevel->priv->grid);
 }
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 static void
 background_changed (PanelBackground *background,
 PanelToplevel *toplevel)
@@ -4758,14 +4650,11 @@ background_changed (PanelBackground *background,
 panel_toplevel_update_edges (toplevel);
 panel_widget_emit_background_changed (toplevel->priv->panel_widget);
 }
-#endif
 
 static void
 panel_toplevel_init (PanelToplevel *toplevel)
 {
-#if GTK_CHECK_VERSION (3, 18, 0)
 GtkWidget *widget;
-#endif
 int i;
 
 toplevel->priv = PANEL_TOPLEVEL_GET_PRIVATE (toplevel);
@@ -4849,20 +4738,16 @@ panel_toplevel_init (PanelToplevel *toplevel)
 toplevel->priv->updated_geometry_initial = FALSE;
 toplevel->priv->initial_animation_done = FALSE;
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 widget = GTK_WIDGET (toplevel);
 gtk_widget_add_events (widget,
-#else
- gtk_widget_add_events (GTK_WIDGET (toplevel),
-#endif
 GDK_BUTTON_PRESS_MASK |
 GDK_BUTTON_RELEASE_MASK |
 GDK_POINTER_MOTION_MASK |
 GDK_ENTER_NOTIFY_MASK |
 GDK_LEAVE_NOTIFY_MASK);
-#if GTK_CHECK_VERSION (3, 18, 0)
+
 gtk_widget_set_app_paintable (widget, TRUE);
-#endif
+
 panel_toplevel_setup_widgets (toplevel);
 panel_toplevel_update_description (toplevel);
 panel_toplevel_update_gtk_settings (toplevel);
@@ -4874,11 +4759,10 @@ panel_toplevel_init (PanelToplevel *toplevel)
 */
 g_signal_connect(GTK_WIDGET(toplevel), "delete-event", G_CALLBACK(gtk_true), NULL);
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 panel_background_init (&toplevel->background,
 (PanelBackgroundChangedNotify) background_changed,
 toplevel); 
-#endif 
+
 /*ensure the panel BG can always be themed*/
 /*Without this gtk3.19/20 cannot set the BG color and resetting the bg to system is not immediately applied*/
 GtkStyleContext *context;
diff --git a/mate-panel/panel-toplevel.h b/mate-panel/panel-toplevel.h
index 51bc0059..206397da 100644
--- a/mate-panel/panel-toplevel.h
+++ b/mate-panel/panel-toplevel.h
@@ -28,10 +28,7 @@
 #include <gtk/gtk.h>
 
 #include "panel-background.h"
-
-#if GTK_CHECK_VERSION (3, 18, 0)
 #include "panel-enums.h"
-#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -60,9 +57,7 @@ struct _PanelToplevel {
 GSettings *settings;
 GSettings *queued_settings;
 GSettings *background_settings;
-#if GTK_CHECK_VERSION (3, 18, 0)
 PanelBackground background;
-#endif
 PanelToplevelPrivate *priv;
 };
 
diff --git a/mate-panel/panel-widget.c b/mate-panel/panel-widget.c
index ce9d88b0..a11e4432 100644
--- a/mate-panel/panel-widget.c
+++ b/mate-panel/panel-widget.c
@@ -78,16 +78,6 @@ static void panel_widget_cremove (GtkContainer *container,
 static void panel_widget_dispose (GObject *obj);
 static void panel_widget_finalize (GObject *obj);
 
-#if !GTK_CHECK_VERSION (3, 18, 0)
-static void panel_widget_realize (GtkWidget *widget);
-static void panel_widget_unrealize (GtkWidget *panel);
-static void panel_widget_state_flags_changed (GtkWidget *widget,
- GtkStateFlags previous_state);
-static void panel_widget_style_updated (GtkWidget *widget);
-static void panel_widget_background_changed (PanelBackground *background,
- PanelWidget *panel);
-#endif
-
 static void panel_widget_push_move_applet (PanelWidget *panel,
 GtkDirectionType dir);
 static void panel_widget_switch_move_applet (PanelWidget *panel,
@@ -424,15 +414,8 @@ panel_widget_class_init (PanelWidgetClass *class)
 widget_class->get_preferred_width = panel_widget_get_preferred_width;
 widget_class->get_preferred_height = panel_widget_get_preferred_height;
 widget_class->size_allocate = panel_widget_size_allocate;
-#if GTK_CHECK_VERSION (3, 20, 0)
+
 gtk_widget_class_set_css_name (widget_class, "PanelWidget");
-#endif
-#if !GTK_CHECK_VERSION (3, 18, 0)
- widget_class->realize = panel_widget_realize;
- widget_class->unrealize = panel_widget_unrealize;
- widget_class->state_flags_changed = panel_widget_state_flags_changed;
- widget_class->style_updated = panel_widget_style_updated;
-#endif
 
 widget_class->focus = panel_widget_real_focus;
 container_class->add = panel_widget_cadd;
@@ -1371,30 +1354,7 @@ queue_resize_on_all_applets(PanelWidget *panel)
 gtk_widget_queue_resize (ad->applet);
 }
 }
-#if !GTK_CHECK_VERSION(3, 18, 0)
-static void
-panel_widget_set_background_region (PanelWidget *panel)
-{
- GtkWidget *widget;
- int origin_x = -1, origin_y = -1;
- GtkAllocation allocation;
 
- widget = GTK_WIDGET (panel);
-
- if (!gtk_widget_get_realized (widget))
- return;
-
- gdk_window_get_origin (gtk_widget_get_window (widget), &origin_x, &origin_y);
-
- gtk_widget_get_allocation (widget, &allocation);
-
- panel_background_change_region (
- &panel->background, panel->orient,
- origin_x, origin_y,
- allocation.width,
- allocation.height);
-}
-#endif
 static void
 panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 {
@@ -1587,9 +1547,6 @@ panel_widget_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 }
 }
 
-#if !GTK_CHECK_VERSION(3, 18, 0)
- panel_widget_set_background_region (panel);
-#endif
 gtk_widget_queue_resize(widget);
 }
 
@@ -1611,13 +1568,8 @@ panel_widget_is_cursor(PanelWidget *panel, int overlap)
 !gtk_widget_get_visible(widget))
 return FALSE;
 
-#if GTK_CHECK_VERSION(3, 20, 0)
 device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (widget)));
 gdk_window_get_device_position(gtk_widget_get_window (widget), device, &x, &y, NULL);
-#else
- device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (widget)));
- gdk_window_get_device_position(gtk_widget_get_window (widget), device, &x, &y, NULL);
-#endif
 
 gtk_widget_get_allocation (widget, &allocation);
 w = allocation.width;
@@ -1631,94 +1583,6 @@ panel_widget_is_cursor(PanelWidget *panel, int overlap)
 return FALSE;
 }
 
-#if !GTK_CHECK_VERSION (3, 18, 0)
-static void
-panel_widget_set_background_default_style (GtkWidget *widget)
-{
- GtkStyleContext *context;
- GtkStateFlags state;
- GdkRGBA *bg_color;
- cairo_pattern_t *bg_image;
- PanelBackground *background;
-
- if (gtk_widget_get_realized (widget)) {
- context = gtk_widget_get_style_context (widget);
- state = gtk_widget_get_state_flags (widget);
- background = &PANEL_WIDGET (widget)->background;
- panel_background_apply_css (&PANEL_WIDGET (widget)->background, widget);
- gtk_style_context_add_class(context,"gnome-panel-menu-bar");
- gtk_style_context_add_class(context,"mate-panel-menu-bar"); 
-
- gtk_style_context_get (context, state,
- "background-color", &bg_color,
- "background-image", &bg_image,
- NULL);
-
- panel_background_set_default_style (background,
- bg_color,
- bg_image);
-
- if (bg_image)
- cairo_pattern_destroy (bg_image);
- }
-}
-
-static void
-panel_widget_state_flags_changed (GtkWidget *widget, GtkStateFlags previous_state)
-{
- panel_widget_set_background_default_style (widget);
-}
-
-static void
-panel_widget_style_updated (GtkWidget *widget)
-{
- GTK_WIDGET_CLASS (panel_widget_parent_class)->style_updated (widget);
- panel_widget_set_background_default_style (widget);
-}
-
-static gboolean
-toplevel_configure_event (GtkWidget *widget,
- GdkEventConfigure *event,
- PanelWidget *panel)
-{
- panel_widget_set_background_region (panel);
- return FALSE;
-}
-
-static void
-panel_widget_realize (GtkWidget *widget)
-{
- PanelWidget *panel = (PanelWidget *) widget;
- GdkWindow *window;
-
- g_signal_connect (panel->toplevel, "configure-event",
- G_CALLBACK (toplevel_configure_event), panel);
-
- GTK_WIDGET_CLASS (panel_widget_parent_class)->realize (widget);
-
- window = gtk_widget_get_window (widget);
-
- panel_widget_set_background_default_style (widget);
-
- panel_background_realized (&panel->background, window);
-}
-
-static void
-panel_widget_unrealize (GtkWidget *widget)
-{
- PanelWidget *panel = (PanelWidget *) widget;
-
- panel_background_unrealized (&panel->background);
-
- g_signal_handlers_disconnect_by_func (
- panel->toplevel,
- G_CALLBACK (toplevel_configure_event),
- panel);
-
- GTK_WIDGET_CLASS (panel_widget_parent_class)->unrealize (widget);
-}
-#endif
-
 static void
 panel_widget_finalize (GObject *obj)
 {
@@ -1727,9 +1591,7 @@ panel_widget_finalize (GObject *obj)
 g_return_if_fail (PANEL_IS_WIDGET (obj));
 
 panel = PANEL_WIDGET (obj);
-#if !GTK_CHECK_VERSION(3, 18, 0)
- panel_background_free (&panel->background);
-#endif
+
 if (panel->applets_hints != NULL)
 g_free (panel->applets_hints);
 panel->applets_hints = NULL;
@@ -1813,11 +1675,7 @@ panel_widget_init (PanelWidget *panel)
 panel->nb_applets_size_hints = 0;
 panel->applets_hints = NULL;
 panel->applets_using_hint = NULL;
-#if !GTK_CHECK_VERSION(3, 18, 0)
- panel_background_init (&panel->background,
- (PanelBackgroundChangedNotify) panel_widget_background_changed,
- panel);
-#endif
+
 panels = g_slist_append (panels, panel);
 }
 
@@ -1948,29 +1806,16 @@ panel_widget_applet_drag_start (PanelWidget *panel,
 GdkGrabStatus status;
 GdkCursor *fleur_cursor;
 GdkDisplay *display;
-#if GTK_CHECK_VERSION(3, 20, 0)
 GdkSeat *seat;
-#else
- GdkDevice *pointer;
- GdkDeviceManager *device_manager;
-#endif
+
 fleur_cursor = gdk_cursor_new_for_display (gdk_display_get_default (),
 GDK_FLEUR);
 
 display = gdk_window_get_display (window);
-#if GTK_CHECK_VERSION(3, 20, 0)
 seat = gdk_display_get_default_seat (display);
 
 status = gdk_seat_grab (seat, window, GDK_SEAT_CAPABILITY_POINTER,
 FALSE, fleur_cursor, NULL, NULL, NULL);
-#else
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
- status = gdk_device_grab (pointer, window,
- GDK_OWNERSHIP_NONE, FALSE,
- APPLET_EVENT_MASK,
- fleur_cursor, time_);
-#endif
 
 g_object_unref (fleur_cursor);
 gdk_flush ();
@@ -1986,31 +1831,19 @@ panel_widget_applet_drag_start (PanelWidget *panel,
 void
 panel_widget_applet_drag_end (PanelWidget *panel)
 {
-#if GTK_CHECK_VERSION(3, 20, 0)
 GdkDisplay *display;
 GdkSeat *seat;
-#else
- GdkDisplay *display;
- GdkDevice *pointer;
- GdkDeviceManager *device_manager;
-#endif
 
 g_return_if_fail (PANEL_IS_WIDGET (panel));
 
 if (panel->currently_dragged_applet == NULL)
 return;
-#if GTK_CHECK_VERSION(3, 20, 0)
+
 display = gtk_widget_get_display (GTK_WIDGET (panel));
 seat = gdk_display_get_default_seat (display);
 
 gdk_seat_ungrab (seat);
-#else
- display = gtk_widget_get_display (GTK_WIDGET (panel));
- device_manager = gdk_display_get_device_manager (display);
- pointer = gdk_device_manager_get_client_pointer (device_manager);
 
- gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
-#endif
 gtk_grab_remove (panel->currently_dragged_applet->applet);
 panel_widget_applet_drag_end_no_grab (panel);
 panel_toplevel_pop_autohide_disabler (panel->toplevel);
@@ -2027,13 +1860,8 @@ panel_widget_get_cursorloc (PanelWidget *panel)
 
 g_return_val_if_fail (PANEL_IS_WIDGET (panel), -1);
 
-#if GTK_CHECK_VERSION (3, 20, 0)
 device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (GTK_WIDGET(panel))));
 gdk_window_get_device_position(gtk_widget_get_window (GTK_WIDGET(panel)), device, &x, &y, NULL);
-#else
- device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (GTK_WIDGET(panel))));
- gdk_window_get_device_position(gtk_widget_get_window (GTK_WIDGET(panel)), device, &x, &y, NULL);
-#endif
 rtl = gtk_widget_get_direction (GTK_WIDGET (panel)) == GTK_TEXT_DIR_RTL;
 
 if (panel->orient == GTK_ORIENTATION_HORIZONTAL)
@@ -2256,13 +2084,8 @@ panel_widget_applet_move_to_cursor (PanelWidget *panel)
 }
 }
 
-#if GTK_CHECK_VERSION (3, 20, 0)
 device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (GTK_WIDGET (panel))));
 gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET(panel)), device, NULL, NULL, &mods);
-#else
- device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (GTK_WIDGET (panel))));
- gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET(panel)), device, NULL, NULL, &mods);
-#endif
 
 movement = PANEL_SWITCH_MOVE;
 
@@ -2316,13 +2139,8 @@ move_timeout_handler(gpointer data)
 
 widget = panel->currently_dragged_applet->applet;
 
-#if GTK_CHECK_VERSION (3, 20, 0)
 device = gdk_seat_get_pointer (gdk_display_get_default_seat (gtk_widget_get_display (widget)));
 gdk_window_get_device_position (gtk_widget_get_window (widget), device, &x, &y, NULL);
-#else
- device = gdk_device_manager_get_client_pointer (gdk_display_get_device_manager (gtk_widget_get_display (widget)));
- gdk_window_get_device_position(gtk_widget_get_window (widget), device, &x, &y, NULL);
-#endif
 
 gtk_widget_get_allocation (widget, &allocation);
 w = allocation.width;
@@ -2823,24 +2641,11 @@ panel_widget_set_size (PanelWidget *panel_widget,
 gtk_widget_queue_resize (GTK_WIDGET (panel_widget));
 }
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 void
 panel_widget_emit_background_changed (PanelWidget *panel)
 {
 g_signal_emit (panel, panel_widget_signals [BACK_CHANGE_SIGNAL], 0);
 }
-#else
-static void
-panel_widget_background_changed (PanelBackground *background,
- PanelWidget *panel)
-{
- g_return_if_fail (PANEL_IS_WIDGET (panel));
- panel_toplevel_update_edges (panel->toplevel);
- g_signal_emit (G_OBJECT (panel),
- panel_widget_signals [BACK_CHANGE_SIGNAL],
- 0);
-}
-#endif
 
 static void 
 panel_widget_push_move_applet (PanelWidget *panel,
diff --git a/mate-panel/panel-widget.h b/mate-panel/panel-widget.h
index e9064085..e84cc6c2 100644
--- a/mate-panel/panel-widget.h
+++ b/mate-panel/panel-widget.h
@@ -206,9 +206,7 @@ void panel_widget_focus (PanelWidget *panel);
 
 PanelOrientation panel_widget_get_applet_orientation (PanelWidget *panel);
 
-#if GTK_CHECK_VERSION (3, 18, 0)
 void panel_widget_emit_background_changed (PanelWidget *panel);
-#endif
 
 void panel_widget_set_applet_size_constrained (PanelWidget *panel,
 GtkWidget *applet,
diff --git a/mate-panel/panel.c b/mate-panel/panel.c
index 8b4401f2..aa129e4b 100644
--- a/mate-panel/panel.c
+++ b/mate-panel/panel.c
@@ -157,12 +157,7 @@ back_change (AppletInfo *info,
 switch (info->type) {
 case PANEL_OBJECT_APPLET:
 mate_panel_applet_frame_change_background (
-
-#if GTK_CHECK_VERSION (3, 18, 0)
 MATE_PANEL_APPLET_FRAME (info->widget), panel->toplevel->background.type);
-#else
- MATE_PANEL_APPLET_FRAME (info->widget), panel->background.type);
-#endif
 break;
 case PANEL_OBJECT_MENU_BAR:
 panel_menu_bar_change_background (PANEL_MENU_BAR (info->widget));
diff --git a/mate-panel/xstuff.c b/mate-panel/xstuff.c
index 20f1dfe9..7db48acf 100644
--- a/mate-panel/xstuff.c
+++ b/mate-panel/xstuff.c
@@ -335,12 +335,8 @@ xstuff_zoom_animate (GtkWidget *widget,
 GdkScreen *gscreen;
 GdkRectangle rect, dest;
 GtkAllocation allocation;
-#if GTK_CHECK_VERSION (3, 22, 0)
 GdkMonitor *monitor;
 GdkDisplay *display;
-#else
- int monitor;
-#endif
 
 if (opt_rect)
 rect = *opt_rect;
@@ -363,16 +359,10 @@ xstuff_zoom_animate (GtkWidget *widget,
 rect.width, rect.height,
 pixbuf, orientation);
 else {
-#if GTK_CHECK_VERSION (3, 22, 0)
 display = gdk_screen_get_display (gscreen);
 monitor = gdk_display_get_monitor_at_window (display,
 gtk_widget_get_window (widget));
 gdk_monitor_get_geometry (monitor, &dest);
-#else
- monitor = gdk_screen_get_monitor_at_window (gscreen,
- gtk_widget_get_window (widget));
- gdk_screen_get_monitor_geometry (gscreen, monitor, &dest);
-#endif
 
 draw_zoom_animation (gscreen,
 rect.x, rect.y, rect.width, rect.height,
author	monsta <[email protected]>	2018-01-31 09:46:08 +0300
committer	monsta <[email protected]>	2018-01-31 09:46:08 +0300
commit	ab7987701bcea97e4326fecd161c3137080f6077 (patch)
tree	3e49c11405cc69fab4b8a10ba4342cf70078d22a /mate-panel
parent	f553591e0562fd7b4bba0fe6a6182bc0b3747a34 (diff)
download	mate-panel-ab7987701bcea97e4326fecd161c3137080f6077.tar.bz2 mate-panel-ab7987701bcea97e4326fecd161c3137080f6077.tar.xz