[Xfce4-commits] [xfce/xfce4-power-manager] 01/01: Fixup the 3.20 deprecation warnings

[noreply at xfce.org]

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

eric pushed a commit to branch master
in repository xfce/xfce4-power-manager.

commit e119180e74f2640e814a9499e1b34b66bdd5da06
Author: Eric Koegel <eric.koegel at gmail.com>
Date:   Tue May 24 16:29:31 2016 +0300

    Fixup the 3.20 deprecation warnings
---
 .../power-manager-plugin/power-manager-button.c          | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/panel-plugins/power-manager-plugin/power-manager-button.c b/panel-plugins/power-manager-plugin/power-manager-button.c
index 780b713..b1f8e1a 100644
--- a/panel-plugins/power-manager-plugin/power-manager-button.c
+++ b/panel-plugins/power-manager-plugin/power-manager-button.c
@@ -936,7 +936,11 @@ power_manager_button_init (PowerManagerButton *button)
     gtk_widget_set_can_default (GTK_WIDGET (button), FALSE);
     gtk_widget_set_can_focus (GTK_WIDGET (button), FALSE);
     gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
+#if !GTK_CHECK_VERSION (3, 20, 0)
     gtk_button_set_focus_on_click (GTK_BUTTON (button), FALSE);
+#else
+    gtk_widget_set_focus_on_click (GTK_WIDGET (button), FALSE);
+#endif
     gtk_widget_set_name (GTK_WIDGET (button), "xfce4-power-manager-plugin");
 
     button->priv->brightness = xfpm_brightness_new ();
@@ -1503,13 +1507,25 @@ range_scroll_cb (GtkWidget *widget, GdkEvent *event, PowerManagerButton *button)
 static void
 range_show_cb (GtkWidget *widget, PowerManagerButton *button)
 {
+#if !GTK_CHECK_VERSION (3, 20, 0)
     GdkDeviceManager* manager = gdk_display_get_device_manager (gdk_display_get_default());
     GdkDevice* pointer = gdk_device_manager_get_client_pointer (manager);
+#else
+    GdkSeat   *seat = gdk_display_get_default_seat (gdk_display_get_default());
+    GdkDevice *pointer = gdk_seat_get_pointer (seat);
+#endif
+
     TRACE("entering");
     /* Release these grabs as they will cause a lockup if pkexec is called
      * for the brightness helper */
     if (pointer)
+    {
+#if !GTK_CHECK_VERSION (3, 20, 0)
         gdk_device_ungrab (pointer, GDK_CURRENT_TIME);
+#else
+        gdk_seat_ungrab (seat);
+#endif
+    }
 
     gtk_grab_remove (widget);
 }

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