File mate-settings-daemon-gtk-3.20.patch of Package mate-settings-daemon

Overview Repositories Revisions Requests Users Attributes Meta

File mate-settings-daemon-gtk-3.20.patch of Package mate-settings-daemon (Revision 7f849c859591745440c050de338f14a7)

Currently displaying revision 7f849c859591745440c050de338f14a7 , Show latest

--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,9 @@ dnl - Dependencies
 dnl ---------------------------------------------------------------------------
 
 DBUS_GLIB_REQUIRED_VERSION=0.74
-GLIB_REQUIRED_VERSION=2.50.0
-GIO_REQUIRED_VERSION=2.50.0
-GTK_REQUIRED_VERSION=3.22.0
+GLIB_REQUIRED_VERSION=2.48.0
+GIO_REQUIRED_VERSION=2.48.0
+GTK_REQUIRED_VERSION=3.20.0
 MATE_DESKTOP_REQUIRED_VERSION=1.21.2
 LIBMATEKBD_REQUIRED_VERSION=1.17.0
 LIBNOTIFY_REQUIRED_VERSION=0.7.0
--- a/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c
+++ b/plugins/a11y-keyboard/msd-a11y-keyboard-manager.c
@@ -435,7 +435,11 @@ ax_response_callback (MsdA11yKeyboardMan
 
         case GTK_RESPONSE_HELP:
                 err = NULL;
+#if GTK_CHECK_VERSION (3, 22, 0)
                 if (!gtk_show_uri_on_window (parent,
+#else
+                if (!gtk_show_uri (gtk_window_get_screen (parent),
+#endif
                                    "help:mate-user-guide/goscustaccess-6",
                                    gtk_get_current_event_time(),
                                    &err)) {
--- a/plugins/media-keys/msd-media-keys-manager.c
+++ b/plugins/media-keys/msd-media-keys-manager.c
@@ -424,7 +424,11 @@ dialog_show (MsdMediaKeysManager *manage
         GtkRequisition win_req;
         GdkScreen     *pointer_screen;
         GdkRectangle   geometry;
+#if GTK_CHECK_VERSION (3, 22, 0)
         GdkMonitor    *monitor;
+#else
+        gint           monitor;
+#endif
 
         gtk_window_set_screen (GTK_WINDOW (manager->priv->dialog),
                                manager->priv->current_screen);
@@ -462,12 +466,28 @@ dialog_show (MsdMediaKeysManager *manage
                 /* 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 (gdk_display_get_default_screen (display),
+                                                           pointer_x,
+                                                           pointer_y);
+#endif
         }
 
+#if GTK_CHECK_VERSION (3, 22, 0)
         gdk_monitor_get_geometry (monitor, &geometry);
+#else
+        gdk_screen_get_monitor_geometry (gdk_display_get_default_screen (display),
+                                         monitor,
+                                         &geometry);
+#endif
 
         screen_w = geometry.width;
         screen_h = geometry.height;
@@ -1010,10 +1030,18 @@ static void
 do_display_osd_action (MsdMediaKeysManager *manager)
 {
         GdkDisplay *display;
+#if !GTK_CHECK_VERSION (3, 22, 0)
+        GdkScreen  *screen;
+#endif
         int         n_monitors;
 
         display = gdk_display_get_default ();
+#if GTK_CHECK_VERSION (3, 22, 0)
         n_monitors = gdk_display_get_n_monitors (display);
+#else
+        screen = gdk_display_get_default_screen (display);
+        n_monitors = gdk_screen_get_n_monitors (screen);
+#endif
 
         dialog_init (manager);
         if (n_monitors > 1)
--- a/plugins/xsettings/msd-xsettings-manager.c
+++ b/plugins/xsettings/msd-xsettings-manager.c
@@ -234,21 +234,38 @@ static int
 get_window_scale_auto ()
 {
         GdkDisplay   *display;
+#if GTK_CHECK_VERSION (3, 22, 0)
         GdkMonitor   *monitor;
+#else
+        GdkScreen    *screen;
+        gint          monitor;
+#endif
         GdkRectangle  rect;
         int width_mm, height_mm;
         int monitor_scale, window_scale;
 
         display = gdk_display_get_default ();
+#if GTK_CHECK_VERSION (3, 22, 0)
         monitor = gdk_display_get_primary_monitor (display);
+#else
+        screen = gdk_display_get_default_screen (display);
+        monitor = gdk_screen_get_primary_monitor (screen);
+#endif
 
         /* Use current value as the default */
         window_scale = 1;
 
+#if GTK_CHECK_VERSION (3, 22, 0)
         gdk_monitor_get_geometry (monitor, &rect);
         width_mm = gdk_monitor_get_width_mm (monitor);
         height_mm = gdk_monitor_get_height_mm (monitor);
         monitor_scale = gdk_monitor_get_scale_factor (monitor);
+#else
+        gdk_screen_get_monitor_geometry (screen, monitor, &rect);
+        width_mm = gdk_screen_get_monitor_width_mm (screen, monitor);
+        height_mm = gdk_screen_get_monitor_height_mm (screen, monitor);
+        monitor_scale = gdk_screen_get_monitor_scale_factor (screen, monitor);
+#endif
 
         if (rect.height * monitor_scale < HIDPI_MIN_HEIGHT)
                 return 1;

Places

File mate-settings-daemon-gtk-3.20.patch of Package mate-settings-daemon (Revision 7f849c859591745440c050de338f14a7)

Places