[Xfce4-commits] <parole:master> Add colorkey back for < 3.8

[Sean Davis]

Updating branch refs/heads/master
         to 6a58040cdde2d16316d9d11bd1d2631659b868f3 (commit)
       from 703503a83226f4dc9c43c0286faabcf7db9fea30 (commit)

commit 6a58040cdde2d16316d9d11bd1d2631659b868f3
Author: Sean Davis <smd.seandavis at gmail.com>
Date:   Fri Sep 6 20:25:42 2013 -0400

    Add colorkey back for < 3.8

 src/gst/parole-gst.c |    6 ++++++
 src/parole-player.c  |    5 +++++
 2 files changed, 11 insertions(+)

diff --git a/src/gst/parole-gst.c b/src/gst/parole-gst.c
index ec7d9d7..975f1af 100644
--- a/src/gst/parole-gst.c
+++ b/src/gst/parole-gst.c
@@ -481,6 +481,12 @@ parole_gst_set_video_overlay (ParoleGst *gst)
         gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (video_sink),
                           GDK_WINDOW_XID ( gtk_widget_get_window(GTK_WIDGET (gst)) ));
 #endif
+
+#if GTK_CHECK_VERSION(3,8,0)
+#else
+    g_object_set(video_sink, "autopaint-colorkey", FALSE,
+                             "colorkey", 0x080810, NULL);
+#endif
     
     gst_object_unref (video_sink);
 }
diff --git a/src/parole-player.c b/src/parole-player.c
index 658e80f..f1b274b 100644
--- a/src/parole-player.c
+++ b/src/parole-player.c
@@ -3141,6 +3141,11 @@ parole_player_init (ParolePlayer *player)
     gtk_widget_set_valign(tmp_box, GTK_ALIGN_END);
     controls_style = gtk_widget_get_style_context(GTK_WIDGET(controls_overlay));
     gtk_style_context_add_class (controls_style, "osd");
+#if GTK_CHECK_VERSION(3,8,0)
+#else
+    gdk_color_parse("#080810", &background);
+    gtk_widget_modify_bg(GTK_WIDGET(controls_overlay), GTK_STATE_NORMAL, &background);
+#endif
     gtk_widget_reparent(GTK_WIDGET(player->priv->control), tmp_box);
     gtk_overlay_add_overlay(GTK_OVERLAY(controls_overlay), tmp_box);
     gtk_box_set_child_packing( GTK_BOX(player->priv->control), GTK_WIDGET(player->priv->play_box), TRUE, TRUE, 2, GTK_PACK_START );