Merge lp:~rodrigo-moya/ubuntuone-client/fix-617656 into lp:ubuntuone-client

[Rodrigo Moya]

- Plug a memory leak that might be causing #617656
- Added contacts for users with no addressbooks are kept in memory correctly now
- Fixed syncdaemon_metadata_get_is_synced to work for post-generations folders

This branch fixes several bugs:

- Plug a memory leak that might be causing #617656
- Added contacts for users with no addressbooks are kept in memory correctly now
- Fixed syncdaemon_metadata_get_is_synced to work for post-generations folders

[Roman Yepishev (rye)]

Tested syncdaemon_metadata_get_is_synced to work for post-generations folders.
LP:61756 may also be caused by non-started syncdaemon but since nautilus plugin now waits for syncdaemon to be ready it does not hang that way.
Was not able to reproduce the issue with missing addressbooks, so mark this as Approved.

review: Approve (fieldtest)

[John Lenton (chipaca)]

review: Approve

=== modified file 'libsyncdaemon/syncdaemon-filesystem-interface.c'
--- libsyncdaemon/syncdaemon-filesystem-interface.c	2010-08-06 21:24:22 +0000
+++ libsyncdaemon/syncdaemon-filesystem-interface.c	2010-09-16 17:12:21 +0000
@@ -140,6 +140,8 @@
 		g_error_free (error);
 		gmd->callback (gmd->interface, FALSE, NULL, gmd->user_data);
 	}
+
+	g_free (gmd);
 }
 
 /**
@@ -153,7 +155,7 @@
 						    gpointer user_data)
 {
 	GotMetadataData *gmd;
-        const char *method;
+        const gchar *method;
 
 	g_return_if_fail (SYNCDAEMON_IS_FILESYSTEM_INTERFACE (interface));
 

=== modified file 'libsyncdaemon/syncdaemon-metadata.c'
--- libsyncdaemon/syncdaemon-metadata.c	2010-08-06 23:09:21 +0000
+++ libsyncdaemon/syncdaemon-metadata.c	2010-09-16 17:12:21 +0000
@@ -30,6 +30,7 @@
 	gchar *share_id;
 	gchar *node_id;
 	gboolean is_synced;
+	gboolean is_dir;
 };
 
 static void
@@ -97,7 +98,10 @@
 		syncdaemon_metadata_set_server_hash (metadata, g_hash_table_lookup (hash, "server_hash"));
 		syncdaemon_metadata_set_share_id (metadata, g_hash_table_lookup (hash, "share_id"));
 		syncdaemon_metadata_set_node_id (metadata, g_hash_table_lookup (hash, "node_id"));
-		syncdaemon_metadata_set_is_synced (metadata, g_hash_table_lookup (hash, "quick_tree_synced"));
+		syncdaemon_metadata_set_is_synced (
+			metadata,
+			g_strcmp0 (g_hash_table_lookup (hash, "quick_tree_synced"), "synced") == 0);
+		metadata->priv->is_dir = g_strcmp0 (g_hash_table_lookup (hash, "is_dir"), "True") == 0;
 		/* FIXME: we ignore the other values in the hash table since none of our
 		   clients use them for now */
 	}
@@ -236,29 +240,32 @@
 gboolean
 syncdaemon_metadata_get_is_synced (SyncdaemonMetadata *metadata)
 {
-        const gchar * local, * server;
-        gboolean is_updated;
+	gchar *local, *server;
+	gboolean is_updated;
 
 	g_return_val_if_fail (SYNCDAEMON_IS_METADATA (metadata), FALSE);
 
-        local = syncdaemon_metadata_get_local_hash (metadata);
-        server = syncdaemon_metadata_get_server_hash (metadata);
-
-        is_updated = local && server && *local && *server &&
-                strcmp (local, server) == 0;
-
-        /* we are synced if both is_synced and is_updated are true */
-        return metadata->priv->is_synced && is_updated;
+	/* If it's a dir, we have the 'quick_tree_synced' value */
+	if (metadata->priv->is_dir)
+		return metadata->priv->is_synced;
+
+	local = metadata->priv->local_hash;
+	server = metadata->priv->server_hash;
+
+	is_updated = local && server && *local && *server &&
+		g_strcmp0 (local, server) == 0;
+
+        return is_updated;
 }
 
 /**
  * syncdaemon_metadata_set_is_synced:
  */
 void
-syncdaemon_metadata_set_is_synced (SyncdaemonMetadata *metadata, const gchar *is_synced)
+syncdaemon_metadata_set_is_synced (SyncdaemonMetadata *metadata, gboolean is_synced)
 {
 	g_return_if_fail (SYNCDAEMON_IS_METADATA (metadata));
 
-        metadata->priv->is_synced = !is_synced || (is_synced && *is_synced);
+        metadata->priv->is_synced = is_synced;
 }
 

=== modified file 'libsyncdaemon/syncdaemon-metadata.h'
--- libsyncdaemon/syncdaemon-metadata.h	2010-08-06 21:24:22 +0000
+++ libsyncdaemon/syncdaemon-metadata.h	2010-09-16 17:12:21 +0000
@@ -59,7 +59,7 @@
 const gchar        *syncdaemon_metadata_get_node_id (SyncdaemonMetadata *metadata);
 void                syncdaemon_metadata_set_node_id (SyncdaemonMetadata *metadata, const gchar *node_id);
 gboolean            syncdaemon_metadata_get_is_synced (SyncdaemonMetadata *metadata);
-void                syncdaemon_metadata_set_is_synced (SyncdaemonMetadata *metadata, const gchar *is_synced);
+void                syncdaemon_metadata_set_is_synced (SyncdaemonMetadata *metadata, gboolean is_synced);
 
 
 #endif

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-09-07 15:21:00 +0000
+++ nautilus/contacts-view.c	2010-09-16 17:12:21 +0000
@@ -79,6 +79,11 @@
 		cv->source_list = NULL;
 	}
 
+	if (cv->added_contacts != NULL) {
+		g_hash_table_destroy (cv->added_contacts);
+		cv->added_contacts = NULL;
+	}
+
 	while (cv->books != NULL) {
 		EBook *book = (EBook *) cv->books->data;
 		cv->books = g_slist_remove (cv->books, book);
@@ -153,6 +158,7 @@
 		GTK_TREE_SELECTION (view),
 		&model);
 #endif
+
 	for (l = selected_items; l != NULL; l = l->next) {
 		GtkTreeIter iter;
 
@@ -387,7 +393,7 @@
 #endif
 
 	gtk_list_store_prepend (model, &new_row);
-	gtk_list_store_set (GTK_LIST_STORE (model), &new_row,
+	gtk_list_store_set (model, &new_row,
 			    CONTACTS_VIEW_COLUMN_NAME, contact_name,
 			    CONTACTS_VIEW_COLUMN_MARKUP, contact_markedup_name,
 			    CONTACTS_VIEW_COLUMN_EMAIL, contact_email,
@@ -544,6 +550,7 @@
 	cv->selection = g_hash_table_new_full (g_str_hash, g_str_equal,
 					       (GDestroyNotify) g_free,
 					       (GDestroyNotify) free_selected_contact_info);
+	cv->added_contacts = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
 	/* Get recently used contacts */
 	cv->config_client = gconf_client_get_default ();
@@ -692,6 +699,22 @@
 		retrieve_contacts (cv, book, search_string, tmp_selection);
 	}
 
+	/* If we added contacts in-memory, add them to the model now */
+	g_hash_table_iter_init (&hash_iter, cv->added_contacts);
+	while (g_hash_table_iter_next (&hash_iter, &key, &value)) {
+		gchar *markup;
+
+		/* We only add it if it's not on the other lists */
+		if (!g_hash_table_lookup (tmp_selection, key)) {
+			markup = g_markup_escape_text ((const gchar *) key, -1);
+			add_one_contact (cv, (const gchar *) key,
+					 (const gchar *) markup,
+					 (const gchar *) value,
+					 NULL, tmp_selection);
+			g_free (markup);
+		}
+	}
+
 	g_hash_table_unref (tmp_selection);
 }
 
@@ -741,6 +764,7 @@
 	GSList *l;
 	gchar *s;
 	GdkPixbuf *pixbuf;
+	gboolean added = FALSE;
 
 	icon_theme = gtk_icon_theme_get_default ();
 
@@ -776,7 +800,9 @@
 			e_contact_set (contact, E_CONTACT_FULL_NAME, (gconstpointer) contact_name);
 			e_contact_set (contact, E_CONTACT_EMAIL_1, (gconstpointer) contact_email);
 
-			if (!e_book_add_contact (E_BOOK (l->data), contact, &error)) {
+			if (e_book_add_contact (E_BOOK (l->data), contact, &error))
+				added = TRUE;
+			else {
 				g_warning ("Could not add contact to %s: %s", uri, error->message);
 				g_error_free (error);
 			}
@@ -786,4 +812,8 @@
 			break;
 		}
 	}
+
+	/* If the contact was not added, keep a copy of it so that it shows */
+	if (!added)
+		g_hash_table_insert (cv->added_contacts, g_strdup (contact_name), g_strdup (contact_email));
 }

=== modified file 'nautilus/contacts-view.h'
--- nautilus/contacts-view.h	2010-07-07 17:25:37 +0000
+++ nautilus/contacts-view.h	2010-09-16 17:12:21 +0000
@@ -44,6 +44,7 @@
 	GSList *books;
 	GHashTable *selection;
 	GHashTable *recently_used;
+	GHashTable *added_contacts;
 
 	/* Widgets */
 	GtkWidget *contacts_list;