[Xfce4-commits] [apps/parole] 01/01: Fix debug builds

[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 d01f43f0d8f58167bf01d79ef4f3f1427c6f1a65
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Sat Feb 25 13:40:38 2017 -0500

    Fix debug builds
---
 src/gst/parole-gst.c              |  3 +++
 src/misc/parole-provider-player.c |  4 ++--
 src/parole-medialist.c            |  3 +++
 src/parole-player.c               | 14 ++++++++++----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index 6bcfe75..1986cfb 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -228,7 +228,10 @@ parole_gst_realize (GtkWidget *widget)
     ParoleGst *gst;
     GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
     GdkWindowAttr attr;
+#if GTK_CHECK_VERSION(3,22,0)
+#else
     GdkRGBA color;
+#endif
     gint mask;
 
     gtk_widget_set_realized (widget, TRUE);
diff --git a/src/misc/parole-provider-player.c b/src/misc/parole-provider-player.c
index 2b6978c..dd2a48d 100644
--- a/src/misc/parole-provider-player.c
+++ b/src/misc/parole-provider-player.c
@@ -499,7 +499,7 @@ GSimpleAction *parole_provider_player_get_action(ParoleProviderPlayer *player, P
  **/
 gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
 {
-    g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+    g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
 
     if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_fullscreen )
     {
@@ -522,7 +522,7 @@ gboolean parole_provider_player_get_fullscreen(ParoleProviderPlayer *player)
  **/
 gboolean parole_provider_player_set_fullscreen(ParoleProviderPlayer *player, gboolean fullscreen)
 {
-    g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), NULL);
+    g_return_val_if_fail (PAROLE_IS_PROVIDER_PLAYER (player), FALSE);
 
     if ( PAROLE_PROVIDER_PLAYER_GET_INTERFACE (player)->get_stream )
     {
diff --git a/src/parole-medialist.c b/src/parole-medialist.c
index b2b42a5..1dbd1ec 100644
--- a/src/parole-medialist.c
+++ b/src/parole-medialist.c
@@ -1313,8 +1313,11 @@ static void
 parole_media_list_show_menu (ParoleMediaList *list, GdkEventButton *ev)
 {
     gboolean val;
+#if GTK_CHECK_VERSION(3,22,0)
+#else
     guint button = ev->button;
     guint activate_time = ev->time;
+#endif
 
     GtkBuilder *builder;
 
diff --git a/src/parole-player.c b/src/parole-player.c
index d74c886..96f8b85 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3076,7 +3076,10 @@ parole_overlay_expose_event (GtkWidget *widget, cairo_t *cr, gpointer user_data)
 {
     GtkAllocation *allocation = g_new0 (GtkAllocation, 1);
     GtkStyleContext *context;
+#if GTK_CHECK_VERSION(3,16,0)
+#else
     GdkRGBA acolor;
+#endif
 
     gtk_widget_get_allocation(widget, allocation);
     cairo_rectangle (cr, 0, 0, allocation->width, allocation->height);
@@ -3306,13 +3309,16 @@ parole_player_init (ParolePlayer *player)
 
     /* Content Area */
     GtkWidget *controls_overlay;
-    #if GTK_CHECK_VERSION(3,10,0)
-    #else
-        GtkWidget *tmp_box;
-    #endif
+#if GTK_CHECK_VERSION(3,10,0)
+#else
+    GtkWidget *tmp_box;
+#endif
     GtkWidget *controls_parent;
     GtkWidget *play_box;
+#if GTK_CHECK_VERSION(3,16,0)
+#else
     GdkRGBA background;
+#endif
     GdkPixbuf *logo;
 
     /* Player Controls */

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