deskbar-applet r2250 - in trunk: . deskbar/handlers

[sebp svn gnome org]

Author: sebp
Date: Mon Jul 21 11:38:43 2008
New Revision: 2250
URL: http://svn.gnome.org/viewvc/deskbar-applet?rev=2250&view=rev

Log:
Check if display name is not None (fixes bug #500087)

Modified:
   trunk/ChangeLog
   trunk/deskbar/handlers/files.py

Modified: trunk/deskbar/handlers/files.py
==============================================================================
--- trunk/deskbar/handlers/files.py	(original)
+++ trunk/deskbar/handlers/files.py	Mon Jul 21 11:38:43 2008
@@ -111,11 +111,12 @@
         for drive in MONITOR.get_mounted_volumes() + MONITOR.get_connected_drives():
             if not drive.is_user_visible() : continue
             if not drive.is_mounted () : continue
-            if not drive.get_display_name().lower().startswith(query): continue
+            display_name = drive.get_display_name()
+            if display_name == None or not display_name.lower().startswith(query): continue
             
             uri = drive.get_activation_uri()
             if uri != None:
-                vol_match = VolumeMatch (drive.get_display_name(), uri, drive.get_icon(), priority=self.get_priority())
+                vol_match = VolumeMatch (display_name, uri, drive.get_icon(), priority=self.get_priority())
                 result.append (vol_match)
         
         self._emit_query_ready(query, result )