nicotine (1.2.16+dfsg-1) 14_about_icon.patch

Summary

 pynicotine/gtkgui/frame.py |   20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

    
download this patch

Patch contents

Index: nicotine-1.2.16+dfsg/pynicotine/gtkgui/frame.py
===================================================================
--- nicotine-1.2.16+dfsg.orig/pynicotine/gtkgui/frame.py	2011-05-18 21:55:15.000000000 +0200
+++ nicotine-1.2.16+dfsg/pynicotine/gtkgui/frame.py	2011-05-18 22:19:09.165435566 +0200
@@ -625,6 +625,9 @@ class NicotineFrame:
 		img.set_from_pixbuf(self.images["away2"])
 		self.awayreturn1.set_image(img)
 		img = gtk.Image()
+		img.set_from_pixbuf(self.images["notify"])
+		self.about_nicotine1.set_image(img)
+		img = gtk.Image()
 		img.set_from_pixbuf(self.images["bug"])
 		self.report_bug.set_image(img)
 		img = gtk.Image()
@@ -794,21 +797,8 @@ class NicotineFrame:
 		scale = None
 		def loadStatic(name):
 			loader = gtk.gdk.PixbufLoader()
-			try:
-				data = getattr(imagedata, "%s_vector" % (name,))
-				loader.write(data, len(data))
-			except (gobject.GError, AttributeError):
-				try:
-					# If we reuse the loader for the PNG we get an GtkWarning about a failing assertion
-					# If we let the loader go out of scope we get a GtkWarning about not finalizing  the loader
-					# If we close the loader it throws an exception on invalid data... 
-					loader.close()
-				except gobject.GError, e:
-					# always happens -_-
-					pass
-				loader = gtk.gdk.PixbufLoader()
-				data = getattr(imagedata, "%s" % (name,))
-				loader.write(data, len(data))
+			data = getattr(imagedata, "%s" % (name,))
+			loader.write(data, len(data))
 			loader.close()
 			pixbuf = loader.get_pixbuf()
 			if scale: