rpms/totem/F-11 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch, NONE, 1.1 totem.spec, 1.238, 1.239

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/totem/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8733

Modified Files:
	totem.spec 
Added Files:
	0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch 
Log Message:
* Fri Jul 31 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-2
- Fix crash when a drive has an emblemed icon (#514914)

0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch:
 totem-menu.c |   21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

--- NEW FILE 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch ---
>From bfc5f434cd87b0d3f933f602eef13dbb1a91f580 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess at hadess.net>
Date: Fri, 31 Jul 2009 19:03:04 +0100
Subject: [PATCH] Fix crash when a (storage) volume has an emblem

See https://bugzilla.redhat.com/show_bug.cgi?id=514914
---
 src/totem-menu.c |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/totem-menu.c b/src/totem-menu.c
index 28b8b73..ec59fea 100644
--- a/src/totem-menu.c
+++ b/src/totem-menu.c
@@ -802,12 +802,22 @@ add_drive_to_menu (GDrive *drive, guint position, Totem *totem)
 		/* Work out an icon to display */
 		icon = g_volume_get_icon (i->data);
 		icon_name = NULL;
-		icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
 
-		for (j = 0; icon_names[j] != NULL; j++) {
-			icon_name = icon_names[j];
-			if (gtk_icon_theme_has_icon (theme, icon_name) != FALSE)
-				break;
+		if (G_IS_EMBLEMED_ICON (icon) != FALSE) {
+			GIcon *new_icon;
+			new_icon = g_emblemed_icon_get_icon (G_EMBLEMED_ICON (icon));
+			g_object_unref (icon);
+			icon = new_icon;
+		}
+
+		if (G_IS_THEMED_ICON (icon)) {
+			icon_names = g_themed_icon_get_names (G_THEMED_ICON (icon));
+
+			for (j = 0; icon_names[j] != NULL; j++) {
+				icon_name = icon_names[j];
+				if (gtk_icon_theme_has_icon (theme, icon_name) != FALSE)
+					break;
+			}
 		}
 
 		/* Get the volume's pretty name for the menu label */
-- 
1.6.2.5



Index: totem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/totem/F-11/totem.spec,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -p -r1.238 -r1.239
--- totem.spec	30 Jun 2009 09:12:25 -0000	1.238
+++ totem.spec	31 Jul 2009 18:08:13 -0000	1.239
@@ -9,7 +9,7 @@
 Summary: Movie player for GNOME
 Name: totem
 Version: 2.26.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ with exceptions
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/totem/
@@ -17,6 +17,7 @@ Source0: http://download.gnome.org/sourc
 Source1: totem-bin-backend-ondemand.sh
 # Will be removed when we switch to playbin2
 Patch0: totem-use-pulsesink-volume.patch
+Patch1: 0001-Fix-crash-when-a-storage-volume-has-an-emblem.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Requires(pre): GConf2 >= 2.14
@@ -211,6 +212,7 @@ audio and video files in the properties 
 pushd totem-%{version}/
 %patch0 -p0 -b .pulsesink-vol
 popd
+%patch1 -p1 -b .emblemed-drive-crash
 # Whatever needs to be changed in both copies do here
 ## remember to update me when changing %doc
 for i in AUTHORS COPYING NEWS README TODO;do
@@ -483,6 +485,9 @@ fi
 %endif
 
 %changelog
+* Fri Jul 31 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-2
+- Fix crash when a drive has an emblemed icon (#514914)
+
 * Tue Jun 30 2009 Bastien Nocera <bnocera at redhat.com> 2.26.3-1
 - Update to 2.26.3