rhythmbox r5537 - in trunk: . plugins/coherence/upnp_coherence

[hadess svn gnome org]

Author: hadess
Date: Wed Jan  9 17:44:17 2008
New Revision: 5537
URL: http://svn.gnome.org/viewvc/rhythmbox?rev=5537&view=rev

Log:
2008-01-09  Bastien Nocera  <hadess hadess net>

	* plugins/coherence/upnp_coherence/__init__.py:
	Patch from Ralph Giles <giles xiph org> to fix warnings
	when there's no ~/.face file (Closes: #505337)



Modified:
   trunk/ChangeLog
   trunk/plugins/coherence/upnp_coherence/__init__.py

Modified: trunk/plugins/coherence/upnp_coherence/__init__.py
==============================================================================
--- trunk/plugins/coherence/upnp_coherence/__init__.py	(original)
+++ trunk/plugins/coherence/upnp_coherence/__init__.py	Wed Jan  9 17:44:17 2008
@@ -38,6 +38,8 @@
 		face_path = os.path.join(os.path.expanduser('~'), ".face")
 		if os.path.exists(face_path):
 			url = "file://" + urllib.pathname2url(face_path)
+		else:
+			url = None
 
 		if url:
 			mimetype = gnomevfs.get_mime_type(url)
@@ -52,6 +54,8 @@
 				'height':height,
 				'depth':depth
 				}
+		else:
+			the_icon = None
 
 		# create our own media server
 		from coherence.upnp.devices.media_server import MediaServer