Merge lp:~dobey/ubuntuone-client/hash-crash-fix into lp:ubuntuone-client

[dobey]

[r=statik, r=jdobrien] Fix the code to handle NULL from g_filename_from_uri

[Elliot Murphy (statik)]

i like it.

review: Approve

[John O'Brien (jdobrien)]

Looks good

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2009-07-02 17:29:23 +0000
+++ nautilus/ubuntuone-nautilus.c	2009-07-06 17:19:38 +0000
@@ -149,14 +149,18 @@
 
   path = g_filename_from_uri (nautilus_file_info_get_uri (file), NULL, NULL);
 
-  if (g_hash_table_lookup (uon->uploads, path))
-    nautilus_file_info_add_emblem (file, "ubuntuone-uploading");
-
-  if (g_hash_table_lookup (uon->downloads, path))
-    nautilus_file_info_add_emblem (file, "ubuntuone-downloading");
-
-  if (g_hash_table_lookup (uon->shares, path))
-    nautilus_file_info_add_emblem (file, "shared");
+  if (path) {
+    if (g_hash_table_lookup (uon->uploads, path))
+      nautilus_file_info_add_emblem (file, "ubuntuone-uploading");
+
+    if (g_hash_table_lookup (uon->downloads, path))
+      nautilus_file_info_add_emblem (file, "ubuntuone-downloading");
+
+    if (g_hash_table_lookup (uon->shares, path))
+      nautilus_file_info_add_emblem (file, "shared");
+
+    g_free (path);
+  }
 
   return NAUTILUS_OPERATION_COMPLETE;
 }
@@ -208,7 +212,7 @@
 
   path = g_filename_from_uri (uri, NULL, NULL);
 
-  if (!ubuntuone_is_storagefs (uon, path))
+  if (!path || !ubuntuone_is_storagefs (uon, path))
     goto location_done;
 
   hbox = gtk_hbox_new (FALSE, 6);
@@ -413,7 +417,7 @@
   shared = g_build_filename (uon->managed, "Shared with Me", NULL);
   myfiles = g_build_filename (uon->managed, "My Files", NULL);
 
-  if (!ubuntuone_is_storagefs (uon, path))
+  if (!path || !ubuntuone_is_storagefs (uon, path))
     goto done;
 
   if (strncmp (path, shared, strlen (shared)) == 0)