[SCM] gnome-mplayer/experimental: Update symbolic icon fix once again

[sramacher at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit d51a4d0bc2da5319fd73dbf6394e90dd8cdb55e0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Dec 30 19:43:53 2012 +0100

    Update symbolic icon fix once again

diff --git a/debian/changelog b/debian/changelog
index 7243cbe..3889cf1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 gnome-mplayer (1.0.7-4) UNRELEASED; urgency=low
 
+  * Team upload.
+  * debian/patches/fallback-to-nonsymbolic.patch: Update upstream's fix once
+    again and fix an incorrect icon.
 
  -- Sebastian Ramacher <sramacher at debian.org>  Sun, 30 Dec 2012 19:42:03 +0100
 
diff --git a/debian/patches/fallback-to-nonsymbolic-icons.patch b/debian/patches/fallback-to-nonsymbolic-icons.patch
index b7d18b7..5d2fe56 100644
--- a/debian/patches/fallback-to-nonsymbolic-icons.patch
+++ b/debian/patches/fallback-to-nonsymbolic-icons.patch
@@ -2,10 +2,11 @@ Description: Fall back to non-symbolic icons if necessary
  If the icon theme doesn't support symoblic icons, fallback to the hicolor
  icons.
 Origin: upstream,
- https://code.google.com/p/gnome-mplayer/source/detail?r=2357
- https://code.google.com/p/gnome-mplayer/source/detail?r=2363
+ https://code.google.com/p/gnome-mplayer/source/detail?r=2357,
+ https://code.google.com/p/gnome-mplayer/source/detail?r=2363,
+ https://code.google.com/p/gnome-mplayer/source/detail?r=2381
 Bug-Debian: http://bugs.debian.org/696714
-Last-Update: 2012-12-26
+Last-Update: 2012-12-30
 
 Index: gnome-mplayer/src/gui.c
 ===================================================================
@@ -261,9 +262,9 @@ Index: gnome-mplayer/src/gui.c
  #ifdef GTK3_ENABLED
 -        gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-restore-symbolic", button_size);
 +		if (gtk_icon_theme_has_icon(icon_theme, "view-restore-symbolic")) {
-+    		gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "view-restore-symbolic", button_size);
++    		gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-restore-symbolic", button_size);
 +		} else {
-+            gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
++            gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
 +		}
  #else
          gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_LEAVE_FULLSCREEN, button_size);
@@ -280,9 +281,9 @@ Index: gnome-mplayer/src/gui.c
  #ifdef GTK3_ENABLED
 -        gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-fullscreen-symbolic", button_size);
 +		if (gtk_icon_theme_has_icon(icon_theme, "view-fullscreen-symbolic")) {
-+    		gtk_image_set_from_icon_name(GTK_IMAGE(image_play), "view-fullscreen-symbolic", button_size);
++    		gtk_image_set_from_icon_name(GTK_IMAGE(image_fs), "view-fullscreen-symbolic", button_size);
 +		} else {
-+            gtk_image_set_from_stock(GTK_IMAGE(image_play), GTK_STOCK_FULLSCREEN, button_size);
++            gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_FULLSCREEN, button_size);
 +		}
  #else
          gtk_image_set_from_stock(GTK_IMAGE(image_fs), GTK_STOCK_FULLSCREEN, button_size);

-- 
gnome-mplayer packaging