[SCM] gnome-mplayer/experimental: Fix the last remaining symbolic icon

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e5015e3f42a401587362d75f55b1d2c9ad853398
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Wed Dec 26 13:39:38 2012 +0100

    Fix the last remaining symbolic icon
    
    Closes: #696714

diff --git a/debian/patches/fallback-to-nonsymbolic-icons.patch b/debian/patches/fallback-to-nonsymbolic-icons.patch
index 5041acb..b7d18b7 100644
--- a/debian/patches/fallback-to-nonsymbolic-icons.patch
+++ b/debian/patches/fallback-to-nonsymbolic-icons.patch
@@ -7,8 +7,10 @@ Origin: upstream,
 Bug-Debian: http://bugs.debian.org/696714
 Last-Update: 2012-12-26
 
---- a/src/gui.c
-+++ b/src/gui.c
+Index: gnome-mplayer/src/gui.c
+===================================================================
+--- gnome-mplayer.orig/src/gui.c	2012-12-26 13:26:28.369863714 +0100
++++ gnome-mplayer/src/gui.c	2012-12-26 13:28:07.296911956 +0100
 @@ -1182,13 +1182,18 @@
  gboolean set_gui_state(void *data)
  {
@@ -230,7 +232,21 @@ Last-Update: 2012-12-26
  #else
      image_play = gtk_image_new_from_stock(GTK_STOCK_MEDIA_PLAY, button_size);
      image_stop = gtk_image_new_from_stock(GTK_STOCK_MEDIA_STOP, button_size);
-@@ -8390,6 +8453,8 @@
+@@ -7983,7 +8046,12 @@
+ #ifdef GTK2_12_ENABLED
+         vol_slider = gtk_volume_button_new();
+ #ifdef GTK3_ENABLED
+-        g_object_set(G_OBJECT(vol_slider), "use-symbolic", TRUE, NULL);
++        if (gtk_icon_theme_has_icon(icon_theme, "audio-volume-muted-symbolic") &&
++            gtk_icon_theme_has_icon(icon_theme, "audio-volume-high-symbolic") &&
++            gtk_icon_theme_has_icon(icon_theme, "audio-volume-low-symbolic") &&
++            gtk_icon_theme_has_icon(icon_theme, "audio-volume-medium-symbolic")) {
++            g_object_set(G_OBJECT(vol_slider), "use-symbolic", TRUE, NULL);
++        }
+ #endif
+         adj = gtk_scale_button_get_adjustment(GTK_SCALE_BUTTON(vol_slider));
+         gtk_scale_button_set_adjustment(GTK_SCALE_BUTTON(vol_slider), adj);
+@@ -8390,6 +8458,8 @@
      GdkScreen *screen;
      GdkRectangle rect;
      GtkAllocation alloc;
@@ -239,7 +255,7 @@ Last-Update: 2012-12-26
      if (fs_controls == NULL && fullscreen) {
          fs_controls = gtk_window_new(GTK_WINDOW_POPUP);
          gtk_widget_add_events(fs_controls, GDK_ENTER_NOTIFY_MASK);
-@@ -8398,7 +8463,11 @@
+@@ -8398,7 +8468,11 @@
          g_signal_connect(G_OBJECT(fs_controls), "leave_notify_event", G_CALLBACK(fs_controls_left), NULL);
          g_object_ref(hbox);
  #ifdef GTK3_ENABLED
@@ -252,7 +268,7 @@ Last-Update: 2012-12-26
  #else
          gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
  #endif
-@@ -8428,11 +8497,16 @@
+@@ -8428,11 +8502,16 @@
  
  void hide_fs_controls()
  {

-- 
gnome-mplayer packaging