Merge lp:~stolowski/unity-lens-files/devices-crash-fix into lp:unity-lens-files

[Paweł Stołowski]

Don't crash on startup if device label or uuid are null.

Don't crash on startup if device label or uuid are null.

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'src/folder.vala'
--- src/folder.vala	2012-09-18 11:08:30 +0000
+++ src/folder.vala	2012-09-19 10:53:21 +0000
@@ -287,7 +287,7 @@
         var label = volume.get_identifier (VolumeIdentifier.LABEL);
         var uuid = volume.get_identifier (VolumeIdentifier.UUID);
   
-        if (label.length == 0 && uuid.length == 0)
+        if ((label == null || label.length == 0) && (uuid == null || uuid.length == 0))
           continue;
  
         var device = new Device (volume);
@@ -377,8 +377,8 @@
       var name = volume.get_name ();
       var icon = volume.get_icon ();
       var icon_name = icon.to_string ();
-      var label = volume.get_identifier (VolumeIdentifier.LABEL);
-      var uuid = volume.get_identifier (VolumeIdentifier.UUID);
+      var label = volume.get_identifier (VolumeIdentifier.LABEL) ?? "";
+      var uuid = volume.get_identifier (VolumeIdentifier.UUID) ?? "";
       var id = "device://" + uuid + "-" + label;
  
       Object (volume:volume, name:name, uri:id, icon:icon,icon_name:icon_name, display_name:name, dnd_uri:id);