Merge lp:~dobey/ubuntuone-client/fix-570261-stable into lp:ubuntuone-client/stable-1-2

[dobey]

As path can be NULL, guard against calling hash_remove with it

[Natalia Bidart (nataliabidart)]

Is there any way I can test this, manually at least?

review: Needs Information

[Rodrigo Moya (rodrigo-moya)]

Indeed g_hash_table_* crash if the passed argument is NULL (although it should really not), so looks good

review: Approve

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-04-16 16:23:19 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-05-28 15:27:40 +0000
@@ -1475,8 +1475,10 @@
   gchar * path;
 
   path = g_hash_table_lookup (hash, "path");
-  g_hash_table_remove (uon->udfs, path);
-  ubuntuone_nautilus_reset_emblem (uon, path);
+  if (path != NULL) {
+	g_hash_table_remove (uon->udfs, path);
+	ubuntuone_nautilus_reset_emblem (uon, path);
+  }
 }
 
 static void ubuntuone_nautilus_udf_error (DBusGProxy * proxy,