[Xfce4-commits] [xfce/exo] 01/01: Bump dependencies to Xfce 4.14 requirements: GTK3 3.20, GLib 2.42

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

b   l   u   e   s   a   b   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository xfce/exo.

commit f4da47c677d2944243f2f4f96816f416baad1e10
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Fri Jun 16 21:27:10 2017 -0400

    Bump dependencies to Xfce 4.14 requirements: GTK3 3.20, GLib 2.42
---
 configure.ac.in     | 12 ++++++------
 exo/exo-icon-view.c | 21 +--------------------
 2 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 52afc8e..f22e78e 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -163,15 +163,15 @@ XDT_I18N([@LINGUAS@], [exo-libexo_version_api()])
 dnl ***********************************
 dnl *** Check for required packages ***
 dnl ***********************************
-XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0])
+XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
+XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.6.0])
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0])
+XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0])
+XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
 XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0], [gio-unix], [GIO-Unix features])
+XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
 
 dnl *********************
 dnl *** Check for X11 ***
diff --git a/exo/exo-icon-view.c b/exo/exo-icon-view.c
index 4ee7354..2d413f5 100644
--- a/exo/exo-icon-view.c
+++ b/exo/exo-icon-view.c
@@ -2938,9 +2938,6 @@ exo_icon_view_update_rubberband (gpointer data)
 #if GTK_CHECK_VERSION (3, 16, 0)
   GdkSeat *seat;
   GdkDevice        *pointer_dev;
-#elif GTK_CHECK_VERSION (3, 0, 0)
-  GdkDeviceManager *device_manager;
-  GdkDevice        *pointer_dev;
 #endif
 
   icon_view = EXO_ICON_VIEW (data);
@@ -2949,10 +2946,6 @@ exo_icon_view_update_rubberband (gpointer data)
   seat = gdk_display_get_default_seat (gdk_window_get_display (icon_view->priv->bin_window));
   pointer_dev = gdk_seat_get_pointer (seat);
   gdk_window_get_device_position (icon_view->priv->bin_window, pointer_dev, &x, &y, NULL);
-#elif GTK_CHECK_VERSION (3, 0, 0)
-  device_manager = gdk_display_get_device_manager (gdk_window_get_display (icon_view->priv->bin_window));
-  pointer_dev = gdk_device_manager_get_client_pointer (device_manager);
-  gdk_window_get_device_position (icon_view->priv->bin_window, pointer_dev, &x, &y, NULL);
 #else
   gdk_window_get_pointer (icon_view->priv->bin_window, &x, &y, NULL);
 #endif
@@ -3577,13 +3570,10 @@ exo_icon_view_set_adjustment_upper (GtkAdjustment *adj,
 #endif
         }
 
-      /* Prior to GTK 3.18, we need to emit "changed" ourselves */
+      /* Prior to GTK 3.18, we need to emit "changed" and "value-changed" ourselves */
 #if !GTK_CHECK_VERSION (3, 18, 0)
       gtk_adjustment_changed (adj);
-#endif
 
-      /* Prior to GTK 3.18, we need to emit "value-changed" ourselves */
-#if !GTK_CHECK_VERSION (3, 18, 0)
       if (value_changed)
         gtk_adjustment_value_changed (adj);
 #endif
@@ -7194,15 +7184,6 @@ exo_icon_view_autoscroll (ExoIconView *icon_view)
 
   gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (icon_view)), pointer_dev, &px, &py, NULL);
   gdk_window_get_geometry (gtk_widget_get_window (GTK_WIDGET (icon_view)), &x, &y, &width, &height);
-#elif GTK_CHECK_VERSION (3, 0, 0)
-  GdkDeviceManager *dev_manager;
-  GdkDevice        *pointer_dev;
-
-  dev_manager = gdk_display_get_device_manager (gdk_window_get_display (gtk_widget_get_window (GTK_WIDGET (icon_view))));
-  pointer_dev = gdk_device_manager_get_client_pointer (dev_manager);
-
-  gdk_window_get_device_position (gtk_widget_get_window (GTK_WIDGET (icon_view)), pointer_dev, &px, &py, NULL);
-  gdk_window_get_geometry (gtk_widget_get_window (GTK_WIDGET (icon_view)), &x, &y, &width, &height);
 #else
   gdk_window_get_pointer (gtk_widget_get_window (GTK_WIDGET (icon_view)), &px, &py, NULL);
   gdk_window_get_geometry (gtk_widget_get_window (GTK_WIDGET (icon_view)), &x, &y, &width, &height, NULL);

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.