conduit r1635 - in trunk: . conduit/utils test/python-tests

[jstowers svn gnome org]

Author: jstowers
Date: Sun Aug  3 02:48:55 2008
New Revision: 1635
URL: http://svn.gnome.org/viewvc/conduit?rev=1635&view=rev

Log:
	* conduit/utils/__init__.py: Fix crasher when hiding dialogs.
	* test/python-tests/common.py: Fix Flickr test (was returning unicode
	urls)


Modified:
   trunk/   (props changed)
   trunk/ChangeLog
   trunk/conduit/utils/__init__.py
   trunk/test/python-tests/common.py

Modified: trunk/conduit/utils/__init__.py
==============================================================================
--- trunk/conduit/utils/__init__.py	(original)
+++ trunk/conduit/utils/__init__.py	Sun Aug  3 02:48:55 2008
@@ -170,13 +170,15 @@
     Sets the dialog to display the busy cursor
     """
     import gtk.gdk
-    dlg.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
+    if dlg and dlg.window:
+        dlg.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.WATCH))
     
 def dialog_reset_cursor(dlg):
     """
     Resets the dialog to display the plain Gtk cursor
     """
-    dlg.window.set_cursor(None)
+    if dlg and dlg.window:
+        dlg.window.set_cursor(None)
 
 def md5_string(string):
     """

Modified: trunk/test/python-tests/common.py
==============================================================================
--- trunk/test/python-tests/common.py	(original)
+++ trunk/test/python-tests/common.py	Sun Aug  3 02:48:55 2008
@@ -468,7 +468,7 @@
                 info = self.sink.module._get_photo_info(safePhotoLUID)
                 ok("Got photo info", info != None)
                 url = self.sink.module._get_raw_photo_url(info)
-                ok("Got photo url (%s)" % url, url != None and Vfs.uri_exists(url))
+                ok("Got photo url (%s)" % url, url != None and Vfs.uri_exists(str(url)))
             except Exception, err:
                 traceback.print_exc()
                 ok("Got photo info/url (%s)" % err, False)