From 336743475664829a64d13bbd70a2c97a58375d0c Mon Sep 17 00:00:00 2001 From: monsta Date: Sun, 28 Jan 2018 21:33:09 +0300 Subject: require GTK+ 3.22 and GLib 2.50 --- configure.ac | 9 +++------ plugins/a11y-keyboard/msd-a11y-keyboard-manager.c | 13 ------------- plugins/common/msd-osd-window.c | 3 +-- plugins/housekeeping/msd-disk-space.c | 5 ----- plugins/housekeeping/msd-ldsm-dialog.c | 8 -------- plugins/housekeeping/msd-ldsm-trash-empty.c | 16 ---------------- plugins/media-keys/msd-media-keys-manager.c | 20 -------------------- plugins/mouse/msd-locate-pointer.c | 18 ------------------ plugins/xrandr/msd-xrandr-manager.c | 4 ---- 9 files changed, 4 insertions(+), 92 deletions(-) diff --git a/configure.ac b/configure.ac index 9c974e6..5128ed2 100644 --- a/configure.ac +++ b/configure.ac @@ -35,9 +35,6 @@ GETTEXT_PACKAGE=mate-settings-daemon AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain]) -AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], - [Warn on use of APIs deprecated before GLib 2.36]) - AM_GLIB_GNU_GETTEXT AS_AC_EXPAND(LIBEXECDIR, "$libexecdir") @@ -54,9 +51,9 @@ dnl - Dependencies dnl --------------------------------------------------------------------------- DBUS_GLIB_REQUIRED_VERSION=0.74 -GLIB_REQUIRED_VERSION=2.36.0 -GIO_REQUIRED_VERSION=2.26.0 -GTK_REQUIRED_VERSION=3.14.0 +GLIB_REQUIRED_VERSION=2.50.0 +GIO_REQUIRED_VERSION=2.50.0 +GTK_REQUIRED_VERSION=3.22.0 MATE_DESKTOP_REQUIRED_VERSION=1.19.3 LIBMATEKBD_REQUIRED_VERSION=1.17.0 LIBNOTIFY_REQUIRED_VERSION=0.7.0 diff --git a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c index b2ce413..acfcdfa 100644 --- a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c +++ b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c @@ -399,9 +399,6 @@ ax_response_callback (MsdA11yKeyboardManager *manager, guint revert_controls_mask, gboolean enabled) { -#if !GTK_CHECK_VERSION (3, 22, 0) - GdkScreen *screen; -#endif GError *err; switch (response_id) { @@ -426,18 +423,8 @@ ax_response_callback (MsdA11yKeyboardManager *manager, break; case GTK_RESPONSE_HELP: -#if GTK_CHECK_VERSION (3, 22, 0) err = NULL; if (!gtk_show_uri_on_window (parent, -#else - if (!parent) - screen = gdk_screen_get_default (); - else - screen = gtk_widget_get_screen (GTK_WIDGET (parent)); - - err = NULL; - if (!gtk_show_uri (screen, -#endif "help:mate-user-guide/goscustaccess-6", gtk_get_current_event_time(), &err)) { diff --git a/plugins/common/msd-osd-window.c b/plugins/common/msd-osd-window.c index 3571282..a3e76d0 100644 --- a/plugins/common/msd-osd-window.c +++ b/plugins/common/msd-osd-window.c @@ -400,9 +400,8 @@ msd_osd_window_class_init (MsdOsdWindowClass *klass) G_TYPE_NONE, 1, G_TYPE_POINTER); -#if GTK_CHECK_VERSION (3, 20, 0) gtk_widget_class_set_css_name (widget_class, "MsdOsdWindow"); -#endif + g_type_class_add_private (klass, sizeof (MsdOsdWindowPrivate)); } diff --git a/plugins/housekeeping/msd-disk-space.c b/plugins/housekeeping/msd-disk-space.c index 3aa1ab7..505d6ab 100644 --- a/plugins/housekeeping/msd-disk-space.c +++ b/plugins/housekeeping/msd-disk-space.c @@ -659,12 +659,7 @@ msd_ldsm_setup (gboolean check_now) msd_ldsm_get_config (); g_signal_connect (settings, "changed", G_CALLBACK (msd_ldsm_update_config), NULL); -#if GLIB_CHECK_VERSION (2, 44, 0) ldsm_monitor = g_unix_mount_monitor_get (); -#else - ldsm_monitor = g_unix_mount_monitor_new (); - g_unix_mount_monitor_set_rate_limit (ldsm_monitor, 1000); -#endif g_signal_connect (ldsm_monitor, "mounts-changed", G_CALLBACK (ldsm_mounts_changed), NULL); diff --git a/plugins/housekeeping/msd-ldsm-dialog.c b/plugins/housekeeping/msd-ldsm-dialog.c index 8a01bca..d9b5cd5 100644 --- a/plugins/housekeeping/msd-ldsm-dialog.c +++ b/plugins/housekeeping/msd-ldsm-dialog.c @@ -223,23 +223,15 @@ msd_ldsm_dialog_init (MsdLdsmDialog *dialog) gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->primary_label), TRUE); gtk_label_set_single_line_mode (GTK_LABEL (dialog->priv->primary_label), FALSE); gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->primary_label), 70); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (dialog->priv->primary_label), 0.0); gtk_label_set_yalign (GTK_LABEL (dialog->priv->primary_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (dialog->priv->primary_label), 0.0, 0.0); -#endif dialog->priv->secondary_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->secondary_label), TRUE); gtk_label_set_single_line_mode (GTK_LABEL (dialog->priv->secondary_label), FALSE); gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->secondary_label), 70); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (dialog->priv->secondary_label), 0.0); gtk_label_set_yalign (GTK_LABEL (dialog->priv->secondary_label), 0.0); -#else - gtk_misc_set_alignment (GTK_MISC (dialog->priv->secondary_label), 0.0, 0.0); -#endif /* Create the check button to ignore future warnings */ dialog->priv->ignore_check_button = gtk_check_button_new (); diff --git a/plugins/housekeeping/msd-ldsm-trash-empty.c b/plugins/housekeeping/msd-ldsm-trash-empty.c index c552c3b..d126b83 100644 --- a/plugins/housekeeping/msd-ldsm-trash-empty.c +++ b/plugins/housekeeping/msd-ldsm-trash-empty.c @@ -252,40 +252,24 @@ trash_empty_start () label1 = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (label1), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label1), 0.0); gtk_label_set_yalign (GTK_LABEL (label1), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label1), 0.0, 0.5); -#endif label3 = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (label3), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (label3), 0.0); gtk_label_set_yalign (GTK_LABEL (label3), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (label3), 0.0, 0.5); -#endif gtk_widget_hide (label3); location_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (location_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (location_label), 0.0); gtk_label_set_yalign (GTK_LABEL (location_label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (location_label), 0.0, 0.5); -#endif file_label = gtk_label_new (NULL); gtk_label_set_line_wrap (GTK_LABEL (file_label), TRUE); -#if GTK_CHECK_VERSION (3, 16, 0) gtk_label_set_xalign (GTK_LABEL (file_label), 0.0); gtk_label_set_yalign (GTK_LABEL (file_label), 0.5); -#else - gtk_misc_set_alignment (GTK_MISC (file_label), 0.0, 0.5); -#endif progressbar = gtk_progress_bar_new (); gtk_progress_bar_set_pulse_step (GTK_PROGRESS_BAR (progressbar), 0.1); diff --git a/plugins/media-keys/msd-media-keys-manager.c b/plugins/media-keys/msd-media-keys-manager.c index a9d36c1..5fab74e 100644 --- a/plugins/media-keys/msd-media-keys-manager.c +++ b/plugins/media-keys/msd-media-keys-manager.c @@ -401,11 +401,7 @@ dialog_show (MsdMediaKeysManager *manager) GtkRequisition win_req; GdkScreen *pointer_screen; GdkRectangle geometry; -#if GTK_CHECK_VERSION (3, 22, 0) GdkMonitor *monitor; -#else - int monitor; -#endif gtk_window_set_screen (GTK_WINDOW (manager->priv->dialog), manager->priv->current_screen); @@ -443,28 +439,12 @@ dialog_show (MsdMediaKeysManager *manager) /* The pointer isn't on the current screen, so just * assume the default monitor */ -#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor (display, 0); -#else - monitor = 0; -#endif } else { -#if GTK_CHECK_VERSION (3, 22, 0) monitor = gdk_display_get_monitor_at_point (display, pointer_x, pointer_y); -#else - monitor = gdk_screen_get_monitor_at_point (manager->priv->current_screen, - pointer_x, - pointer_y); -#endif } -#if GTK_CHECK_VERSION (3, 22, 0) gdk_monitor_get_geometry (monitor, &geometry); -#else - gdk_screen_get_monitor_geometry (manager->priv->current_screen, - monitor, - &geometry); -#endif screen_w = geometry.width; screen_h = geometry.height; diff --git a/plugins/mouse/msd-locate-pointer.c b/plugins/mouse/msd-locate-pointer.c index 2077ca4..505eb90 100644 --- a/plugins/mouse/msd-locate-pointer.c +++ b/plugins/mouse/msd-locate-pointer.c @@ -173,11 +173,7 @@ timeline_frame_cb (MsdTimeline *timeline, MsdLocatePointerData *data = (MsdLocatePointerData *) user_data; GdkDisplay *display = gdk_window_get_display (data->window); GdkScreen *screen = gdk_display_get_default_screen (display); -#if GTK_CHECK_VERSION (3, 20, 0) GdkSeat *seat; -#else - GdkDeviceManager *device_manager; -#endif GdkDevice *pointer; gint cursor_x, cursor_y; @@ -194,13 +190,8 @@ timeline_frame_cb (MsdTimeline *timeline, data->progress += CIRCLES_PROGRESS_INTERVAL; } -#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 gdk_device_get_position (pointer, NULL, &cursor_x, @@ -380,24 +371,15 @@ static void move_locate_pointer_window (MsdLocatePointerData *data, GdkDisplay *display) { -#if GTK_CHECK_VERSION (3, 20, 0) GdkSeat *seat; -#else - GdkDeviceManager *device_manager; -#endif GdkDevice *pointer; gint cursor_x, cursor_y; cairo_t *cr; cairo_surface_t *mask; cairo_region_t *region; -#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 gdk_device_get_position (pointer, NULL, &cursor_x, diff --git a/plugins/xrandr/msd-xrandr-manager.c b/plugins/xrandr/msd-xrandr-manager.c index c2572de..580e157 100644 --- a/plugins/xrandr/msd-xrandr-manager.c +++ b/plugins/xrandr/msd-xrandr-manager.c @@ -1806,12 +1806,8 @@ make_menu_item_for_output_title (MsdXrandrManager *manager, MateRROutputInfo *ou gtk_widget_modify_fg (label, gtk_widget_get_state (label), &black); /* Add padding around the label to fit the box that we'll draw for color-coding */ -#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_set_margin_start (label, OUTPUT_TITLE_ITEM_BORDER + OUTPUT_TITLE_ITEM_PADDING); gtk_widget_set_margin_end (label, OUTPUT_TITLE_ITEM_BORDER + OUTPUT_TITLE_ITEM_PADDING); gtk_widget_set_margin_top (label, OUTPUT_TITLE_ITEM_BORDER + OUTPUT_TITLE_ITEM_PADDING); -- cgit v1.2.1