[Xfce4-commits] [apps/parole] 01/01: Cleanup deprecations, seems to improve drawing controls

[noreply at xfce.org]

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

bluesabre pushed a commit to branch master
in repository apps/parole.

commit f2389217215ef4e5128fc1624cfd96b72ffad973
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Feb 4 22:07:30 2017 -0500

    Cleanup deprecations, seems to improve drawing controls
---
 src/common/parole-common.c |  4 ++--
 src/gst/parole-gst.c       |  5 +++++
 src/parole-medialist.c     |  8 ++++++++
 src/parole-player.c        | 12 ++++++++++++
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/common/parole-common.c b/src/common/parole-common.c
index d811080..d9c8a0c 100644
--- a/src/common/parole-common.c
+++ b/src/common/parole-common.c
@@ -101,7 +101,7 @@ void parole_window_busy_cursor (GdkWindow *window)
     if ( G_UNLIKELY (window == NULL) )
         return;
 
-    cursor = gdk_cursor_new (GDK_WATCH);
+    cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_WATCH);
 
     gdk_window_set_cursor (window, cursor);
 
@@ -118,7 +118,7 @@ void parole_window_invisible_cursor (GdkWindow *window)
     if ( G_UNLIKELY (window == NULL) )
         return;
 
-    cursor = gdk_cursor_new (GDK_BLANK_CURSOR);
+    cursor = gdk_cursor_new_for_display (gdk_display_get_default(), GDK_BLANK_CURSOR);
 
     gdk_window_set_cursor (window, cursor);
 
diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 359ec5b..ff3944a 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -257,8 +257,11 @@ parole_gst_realize (GtkWidget *widget)
 
     gdk_window_set_user_data (gtk_widget_get_window(widget), widget);
 
+#if GTK_CHECK_VERSION(3,22,0)
+#else
     gdk_rgba_parse (&color, "black");
     gdk_window_set_background_rgba (gtk_widget_get_window(widget), &color);
+#endif
 
     g_signal_connect    (gtk_widget_get_toplevel (widget), "configure_event",
                          G_CALLBACK (parole_gst_configure_event_cb), gst);
@@ -2419,7 +2422,9 @@ parole_gst_init (ParoleGst *gst)
      * flickering when resizing the window.
      * Deprecated in GTK+ 3.12, but clutter is broken so adding back.
      */
+    G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_widget_set_double_buffered (GTK_WIDGET (gst), FALSE);
+    G_GNUC_END_IGNORE_DEPRECATIONS
 }
 
 GtkWidget *
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index 7f26b3a..b2b42a5 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1361,10 +1361,14 @@ parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
     g_signal_connect_swapped (menu, "selection-done",
                               G_CALLBACK (parole_media_list_destroy_menu), menu);
 
+#if GTK_CHECK_VERSION(3,22,0)
+    gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+#else
     gtk_menu_popup (GTK_MENU (menu),
                     NULL, NULL,
                     NULL, NULL,
                     button, activate_time);
+#endif
 }
 
 gboolean
@@ -1523,8 +1527,12 @@ parole_media_list_setup_view (ParoleMediaList *list)
     gtk_tree_view_set_model (GTK_TREE_VIEW (list->priv->view), GTK_TREE_MODEL(list_store));
     gtk_tree_view_set_model (GTK_TREE_VIEW (list->priv->disc_view), GTK_TREE_MODEL(disc_list_store));
 
+#if GTK_CHECK_VERSION(3,14,0)
+#else
     gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list->priv->view), TRUE);
     gtk_tree_view_set_rules_hint (GTK_TREE_VIEW (list->priv->disc_view), TRUE);
+#endif
+
     list->priv->col = gtk_tree_view_column_new ();
     list->priv->disc_col = gtk_tree_view_column_new ();
 
diff --git a/src/parole-player.c b/src/parole-player.c
index 1c3a4f6..2857b59 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -2257,10 +2257,14 @@ parole_player_show_menu (ParolePlayer *player, guint button, guint activate_time
     g_signal_connect_swapped (menu, "selection-done",
                               G_CALLBACK (gtk_widget_destroy), menu);
 
+#if GTK_CHECK_VERSION(3,22,0)
+    gtk_menu_popup_at_pointer (GTK_MENU (menu), NULL);
+#else
     gtk_menu_popup (GTK_MENU (menu),
                     NULL, NULL,
                     NULL, NULL,
                     button, activate_time);
+#endif
 }
 
 gboolean
@@ -3033,6 +3037,9 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
     context = gtk_widget_get_style_context(GTK_WIDGET(widget));
     gtk_style_context_add_class (context, "background");
     gtk_style_context_add_class (context, "osd");
+
+#if GTK_CHECK_VERSION(3,16,0)
+#else
     gtk_style_context_get_background_color (context, GTK_STATE_NORMAL, &acolor);
     gdk_cairo_set_source_rgba (cr, &acolor);
     cairo_fill (cr);
@@ -3042,6 +3049,7 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
     cairo_move_to (cr, 0, 0);
     cairo_line_to (cr, allocation->width, 0);
     cairo_stroke (cr);
+#endif
 
     return FALSE;
 }
@@ -3444,8 +3452,12 @@ parole_player_init (ParolePlayer *player)
 
     /* Content Area (Background, Audio, Video) */
     player->priv->eventbox_output = GTK_WIDGET (gtk_builder_get_object (builder, "content_area"));
+
+#if GTK_CHECK_VERSION(3,16,0)
+#else
     gdk_rgba_parse(&background, "black");
     gtk_widget_override_background_color(GTK_WIDGET(player->priv->eventbox_output), GTK_STATE_NORMAL, &background);
+#endif
 
     // Enable motion-notify event to show/hide controls on mouseover
     gtk_widget_add_events (GTK_WIDGET (player->priv->eventbox_output),

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