Merge lp:~asc/spud/diamond_interface_error_handle into lp:spud

[Adam Candy]

Handle errors due to reading the Diamond icon image.
It's helpful if Diamond still opens - the icon isn't critical to its function.

[Patrick Farrell (pefarrell)]

Makes sense!

review: Approve

[lp:~asc/spud/diamond_interface_error_handle]

533. By Patrick Farrell on 2012-09-24

Merge Adam's logofile fix (although we should always find the damn logo).

[Simon Mouradian (mouradian)]

This is interesting, diamond always opens for me, even without the logo...

[Adam Candy (asc)]

Diamond does a great job at finding its logo, and yes, opens fine even without it.

The issue is when it has problems understanding the logo - when the Python wrappers for librsvg are not present for example. The change here handles this, and importantly, allows you to carry on and use Diamond.

Another option would be to provide a fallback png image icon - as has been implemented in Jon's now merged branch ~jon-hill/spud/mac_port. This should fix the SVG read error. It is still useful to have Diamond open irrespective of any further icon issues!

=== modified file 'diamond/bin/diamond'
--- diamond/bin/diamond	2012-07-30 14:17:38 +0000
+++ diamond/bin/diamond	2012-09-22 15:08:22 +0000
@@ -273,7 +273,11 @@
   else:
     plugins.configure_plugins(suffix)
 
+  try:
     i = interface.Diamond(gladefile = gladefile, logofile = logofile, suffix = suffix)
+  except Exception, e:
+    debug.deprint('Error: ' + str(e), 0)
+    i = interface.Diamond(gladefile = gladefile, suffix = suffix)
 
     i.main_window.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
     i.open_file(schemafile = input_schemafile, filename = input_filename)