Merge lp:~rodrigo-moya/ubuntuone-client/fix-645518 into lp:ubuntuone-client/stable-1-4

[Rodrigo Moya]

- Show an error dialog when deleting a share fails
- Plug a memory leak in shares hash table

- Show an error dialog when deleting a share fails
- Plug a memory leak in shares hash table

[Natalia Bidart (nataliabidart)]

I'm getting "There was an error removing the share for the folder '(null)'"

We should remove the path or fill the info in.

review: Needs Fixing

[lp:~rodrigo-moya/ubuntuone-client/fix-645518]

717. By Rodrigo Moya on 2010-09-23

Only show the path in the error message if we got it

[Natalia Bidart (nataliabidart)]

review: Approve

[Alejandro J. Cura (alecu)]

Looks good.

review: Approve

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-09-22 09:44:02 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-09-23 15:08:57 +0000
@@ -122,7 +122,7 @@
   gchar *key;
   NautilusFileInfo *file;
 
-  /* Remove emblems from all files in the specified path */
+  /* Reset emblems from all files in the specified path */
   g_hash_table_iter_init (&iter, uon->observed);
   while (g_hash_table_iter_next (&iter, (gpointer *) &key, (gpointer *) &file)) {
     if (g_str_has_prefix (key, path) || g_strcmp0 (key, path) == 0) {
@@ -818,7 +818,7 @@
   uon->connected = FALSE;
   uon->uploads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   uon->downloads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-  uon->shares = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+  uon->shares = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
   uon->updated = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   uon->needsupdating = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
   uon->observed = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
@@ -1271,6 +1271,15 @@
   if (success) {
     g_hash_table_table_remove (uon->shares, path);
     ubuntuone_nautilus_reset_emblem (uon, path);
+  } else {
+    if (path != NULL) {
+      ubuntuone_show_error_dialog (uon, _("Error deleting share."),
+				   _("There was an error removing the share for the folder '%s'"),
+				   path);
+    } else {
+      ubuntuone_show_error_dialog (uon, _("Error deleting share."),
+				   _("There was an error removing the share"));
+    }
   }
 }