# HG changeset patch
# User Erik Grinaker <erikg@codepoet.no>
# Date 1112812707 0
# Node ID c8c5d2502a09c41d9f48fb435b6727fcc2cc4f13
# Parent  35864a73a048c4e3e7a90c777a1469872f52175f
don't crash on missing revelation icon

diff -r 35864a73a048c4e3e7a90c777a1469872f52175f -r c8c5d2502a09c41d9f48fb435b6727fcc2cc4f13 ChangeLog
--- a/ChangeLog	Thu Mar 31 17:43:29 2005 +0000
+++ b/ChangeLog	Wed Apr 06 18:38:27 2005 +0000
@@ -1,5 +1,12 @@
 Revelation changelog
 
+---------------[ xxxx-xx-xx : 0.4.4 ]---------------
+
+2005-04-06  Erik Grinaker <erikg@codepoet.no>
+
+	* don't crash on missing revelation logo icon
+
+
 ---------------[ 2005-03-31 : 0.4.3 ]---------------
 
 2005-03-31  Erik Grinaker <erikg@codepoet.no>
diff -r 35864a73a048c4e3e7a90c777a1469872f52175f -r c8c5d2502a09c41d9f48fb435b6727fcc2cc4f13 NEWS
--- a/NEWS	Thu Mar 31 17:43:29 2005 +0000
+++ b/NEWS	Wed Apr 06 18:38:27 2005 +0000
@@ -1,3 +1,10 @@
+2005-04-06: Revelation 0.4.3
+============================
+
+Bugfixes:
+- don't crash on missing revelation logo icon
+
+
 2005-03-31: Revelation 0.4.3
 ============================
 
diff -r 35864a73a048c4e3e7a90c777a1469872f52175f -r c8c5d2502a09c41d9f48fb435b6727fcc2cc4f13 TODO
--- a/TODO	Thu Mar 31 17:43:29 2005 +0000
+++ b/TODO	Wed Apr 06 18:38:27 2005 +0000
@@ -39,6 +39,7 @@
 - port to gtk+ 2.6 / gnome 2.10
   - gtk.AboutDialog
   - ellpisize labels in data view with gtk+ api
+  - filechooserbutton
 - bugfix: make autolock filter trigger on certain events only
   (needs pygtk bug #156948 to be fixed first)
 
diff -r 35864a73a048c4e3e7a90c777a1469872f52175f -r c8c5d2502a09c41d9f48fb435b6727fcc2cc4f13 src/lib/dialog.py
--- a/src/lib/dialog.py	Thu Mar 31 17:43:29 2005 +0000
+++ b/src/lib/dialog.py	Wed Apr 06 18:38:27 2005 +0000
@@ -962,7 +962,7 @@
 			self, config.APPNAME, config.VERSION, config.COPYRIGHT,
 			""""%s"\n\nRevelation is a password manager for the GNOME 2 desktop""" % config.RELNAME,
 			( config.AUTHOR, ), None, "",
-			gtk.icon_theme_get_default().load_icon("revelation", 48, 0)
+			parent.render_icon(ui.STOCK_REVELATION, gtk.ICON_SIZE_DIALOG)
 		)
 
 		if parent is not None:
diff -r 35864a73a048c4e3e7a90c777a1469872f52175f -r c8c5d2502a09c41d9f48fb435b6727fcc2cc4f13 src/lib/ui.py
--- a/src/lib/ui.py	Thu Mar 31 17:43:29 2005 +0000
+++ b/src/lib/ui.py	Wed Apr 06 18:38:27 2005 +0000
@@ -1255,7 +1255,11 @@
 	def load_icon(self, id, size):
 		"Loads an icon"
 
-		return self.theme.load_icon(id, size, 0)
+		if self.theme.has_icon(id):
+			return self.theme.load_icon(id, size, 0)
+
+		else:
+			return self.parent.render_icon(gtk.STOCK_MISSING_IMAGE, size)
 
 
 	def load_stock_icon(self, id, icon, sizes):
@@ -1271,7 +1275,7 @@
 				source.set_size(size)
 				source.set_size_wildcarded(False)
 
-				pixbuf = self.theme.load_icon(icon, pixelsize, 0)
+				pixbuf = self.load_icon(icon, pixelsize)
 				source.set_pixbuf(pixbuf)
 				iconset.add_source(source)
 
diff -r 35864a73a048c4e3e7a90c777a1469872f52175f -r c8c5d2502a09c41d9f48fb435b6727fcc2cc4f13 src/revelation.in
--- a/src/revelation.in	Thu Mar 31 17:43:29 2005 +0000
+++ b/src/revelation.in	Wed Apr 06 18:38:27 2005 +0000
@@ -154,12 +154,13 @@
 		"Sets up the UI"
 
 		# set window icons
-		gtk.window_set_default_icon_list(
-			self.items.load_icon("revelation", 48),
-			self.items.load_icon("revelation", 32),
-			self.items.load_icon("revelation", 24),
-			self.items.load_icon("revelation", 16)
-		)
+		if self.items.theme.has_icon("revelation"):
+			gtk.window_set_default_icon_list(
+				self.items.load_icon("revelation", 48),
+				self.items.load_icon("revelation", 32),
+				self.items.load_icon("revelation", 24),
+				self.items.load_icon("revelation", 16)
+			)
 
 		# load UI definitions
 		self.uimanager.add_actions_from_file(config.DIR_UI + "/actions.xml")