Merge lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk into lp:ubuntu/lucid/ubuntuone-client

[dobey]

[lp:~ubuntuone-control-tower/ubuntu/lucid/ubuntuone-client/trunk]

29. By Ken VanDine on 2010-04-20

releasing version 1.2.1-0ubuntu1

=== modified file 'bin/ubuntuone-preferences'
--- bin/ubuntuone-preferences	2010-04-15 15:20:43 +0000
+++ bin/ubuntuone-preferences	2010-04-19 21:29:17 +0000
@@ -210,8 +210,9 @@
         self.status_label = gtk.Label("")
         self.attach(self.status_label, 0, 3, 2, 3)
 
-        self.description = gtk.Label(_("The following devices synchronize"
-                                       " with your Ubuntu One account."))
+        self.description = gtk.Label(_("The devices connected to with your"
+                                       " personal cloud network"
+                                       " are listed below"))
         self.description.set_alignment(0., .5)
         self.description.set_line_wrap(True)
         self.attach(self.description, 0, 3, 0, 1, xpadding=12, ypadding=12)
@@ -991,7 +992,7 @@
         services.pack_start(label, False, False)
         label.show()
 
-        self.bookmarks_check = gtk.CheckButton(_("_Bookmarks (Firefox)"))
+        self.bookmarks_check = gtk.CheckButton(_("_Bookmarks"))
         self.bookmarks_check.set_data('dbname', 'bookmarks')
         self.bookmarks_check.connect('toggled', self.__db_check_toggled)
         services.pack_start(self.bookmarks_check, False, False)

=== modified file 'configure'
--- configure	2010-04-15 15:20:43 +0000
+++ configure	2010-04-19 21:29:17 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for ubuntuone-client 1.2.0.
+# Generated by GNU Autoconf 2.65 for ubuntuone-client 1.2.1.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='ubuntuone-client'
 PACKAGE_TARNAME='ubuntuone-client'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='ubuntuone-client 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='ubuntuone-client 1.2.1'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1476,7 +1476,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ubuntuone-client 1.2.0 to adapt to many kinds of systems.
+\`configure' configures ubuntuone-client 1.2.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1547,7 +1547,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ubuntuone-client 1.2.0:";;
+     short | recursive ) echo "Configuration of ubuntuone-client 1.2.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1660,7 +1660,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ubuntuone-client configure 1.2.0
+ubuntuone-client configure 1.2.1
 generated by GNU Autoconf 2.65
 
 Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1938,7 +1938,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ubuntuone-client $as_me 1.2.0, which was
+It was created by ubuntuone-client $as_me 1.2.1, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   $ $0 $@
@@ -2748,7 +2748,7 @@
 
 # Define the identity of the package.
  PACKAGE='ubuntuone-client'
- VERSION='1.2.0'
+ VERSION='1.2.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12972,7 +12972,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ubuntuone-client $as_me 1.2.0, which was
+This file was extended by ubuntuone-client $as_me 1.2.1, which was
 generated by GNU Autoconf 2.65.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -13038,7 +13038,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ubuntuone-client config.status 1.2.0
+ubuntuone-client config.status 1.2.1
 configured by $0, generated by GNU Autoconf 2.65,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2010-04-15 15:20:43 +0000
+++ configure.ac	2010-04-19 21:29:17 +0000
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.53)
 
-AC_INIT([ubuntuone-client], [1.2.0])
+AC_INIT([ubuntuone-client], [1.2.1])
 AC_CONFIG_SRCDIR([config.h.in])
 
 AM_INIT_AUTOMAKE([1.10 foreign])

=== modified file 'contrib/__init__.pyc'
Binary files contrib/__init__.pyc	2010-04-15 15:20:43 +0000 and contrib/__init__.pyc	2010-04-19 21:29:17 +0000 differ
=== modified file 'contrib/dbus_util.pyc'
Binary files contrib/dbus_util.pyc	2010-04-15 15:20:43 +0000 and contrib/dbus_util.pyc	2010-04-19 21:29:17 +0000 differ
=== modified file 'contrib/testing/__init__.pyc'
Binary files contrib/testing/__init__.pyc	2010-04-15 15:20:43 +0000 and contrib/testing/__init__.pyc	2010-04-19 21:29:17 +0000 differ
=== modified file 'contrib/testing/testcase.pyc'
Binary files contrib/testing/testcase.pyc	2010-04-15 15:20:43 +0000 and contrib/testing/testcase.pyc	2010-04-19 21:29:17 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2010-04-16 17:54:41 +0000
+++ debian/changelog	2010-04-19 21:29:17 +0000
@@ -1,3 +1,14 @@
+ubuntuone-client (1.2.1-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release.
+    - GetPublicFiles loop when unsuccessful (LP: #562443)
+    - Local rescan deletse file on interrupted downloads (LP: #564774)
+    - Unable to share with both existing and new contacts (LP: #563677)
+    - Nautilus crash when contact has no name (LP: #566747)
+  * Remove the string change reversion patch; merged upstream.
+
+ -- Rodney Dawes <[e-mail]>  Mon, 19 Apr 2010 17:16:50 -0400
+
 ubuntuone-client (1.2.0-0ubuntu1) lucid; urgency=low
 
   * New upstream release.

=== removed directory 'debian/patches'
=== removed file 'debian/patches/revert_string_change.patch'
--- debian/patches/revert_string_change.patch	2010-04-16 17:54:41 +0000
+++ debian/patches/revert_string_change.patch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-=== modified file 'bin/ubuntuone-preferences'
---- old/bin/ubuntuone-preferences	2010-04-09 15:09:21 +0000
-+++ new/bin/ubuntuone-preferences	2010-04-05 14:51:51 +0000
-@@ -210,8 +210,9 @@
-         self.status_label = gtk.Label("")
-         self.attach(self.status_label, 0, 3, 2, 3)
- 
--        self.description = gtk.Label(_("The following devices synchronize"
--                                       " with your Ubuntu One account."))
-+        self.description = gtk.Label(_("The devices connected to with your"
-+                                       " personal cloud network"
-+                                       " are listed below"))
-         self.description.set_alignment(0., .5)
-         self.description.set_line_wrap(True)
-         self.attach(self.description, 0, 3, 0, 1, xpadding=12, ypadding=12)
-@@ -977,7 +978,7 @@
-         services.pack_start(label, False, False)
-         label.show()
- 
--        self.bookmarks_check = gtk.CheckButton(_("_Bookmarks (Firefox)"))
-+        self.bookmarks_check = gtk.CheckButton(_("_Bookmarks"))
-         self.bookmarks_check.set_data('dbname', 'bookmarks')
-         self.bookmarks_check.connect('toggled', self.__db_check_toggled)
-         services.pack_start(self.bookmarks_check, False, False)
-

=== modified file 'debian/rules'
--- debian/rules	2010-04-16 17:54:41 +0000
+++ debian/rules	2010-04-19 21:29:17 +0000
@@ -3,7 +3,6 @@
 DEB_PYTHON_SYSTEM = pycentral
 
 include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/gnome.mk
 

=== modified file 'nautilus/contacts-view.c'
--- nautilus/contacts-view.c	2010-04-15 15:20:43 +0000
+++ nautilus/contacts-view.c	2010-04-19 21:29:17 +0000
@@ -315,10 +315,12 @@
 		EContact *contact = l->data;
 		const gchar *email = NULL;
 		GList *emails_list, *al;
+		EContactName *contact_name;
+		gchar *full_name = NULL;
 
-		/* We add the selected items when searching, so ignore them here */
-		if (g_hash_table_lookup (selection_hash, (gconstpointer) e_contact_get_const (contact, E_CONTACT_FULL_NAME)))
-			continue;
+		contact_name = (EContactName *) e_contact_get (contact, E_CONTACT_NAME);
+		if (contact_name != NULL)
+			full_name = e_contact_name_to_string (contact_name);
 
 		emails_list = e_contact_get_attributes (contact, E_CONTACT_EMAIL);
 		for (al = emails_list; al != NULL; al = al->next) {
@@ -329,16 +331,28 @@
 				break;
 		}
 
+		if (full_name == NULL) {
+			if (email != NULL)
+				full_name = g_strdup (email);
+			else {
+				g_warning ("Contact without name or email addresses");
+				continue;
+			}
+		}
+
+		/* We add the selected items when searching, so ignore them here */
+		if (g_hash_table_lookup (selection_hash, (gconstpointer) full_name))
+			continue;
+
 		if (email != NULL) {
-			add_one_contact (cv,
-					 e_contact_get_const (contact, E_CONTACT_FULL_NAME),
-					 e_contact_get_const (contact, E_CONTACT_FULL_NAME),
-					 email,
-					 contact);
+			add_one_contact (cv, full_name, full_name, email, contact);
+			cv->matched_contacts += 1;
 		}
 
 		g_list_foreach (emails_list, (GFunc) e_vcard_attribute_free, NULL);
 		g_list_free (emails_list);
+		e_contact_name_free (contact_name);
+		g_free (full_name);
 	}
 
 	g_signal_emit_by_name (cv, "contacts-count-changed",
@@ -396,6 +410,7 @@
 	GError *error = NULL;
 	GSList *gl;
 
+	cv->matched_contacts = 0;
 	cv->selection = g_hash_table_new_full (g_str_hash, g_str_equal,
 					       (GDestroyNotify) g_free,
 					       (GDestroyNotify) free_selected_contact_info);
@@ -549,6 +564,7 @@
 	/* Reset the icon views */
 	gtk_list_store_clear (GTK_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (cv->recently_used_view))));
 	gtk_list_store_clear (GTK_LIST_STORE (gtk_icon_view_get_model (GTK_ICON_VIEW (cv->alphabetical_view))));
+	cv->matched_contacts = 0;
 
 	g_signal_emit_by_name (cv, "contacts-count-changed",
 			       gtk_tree_model_iter_n_children (gtk_icon_view_get_model (GTK_ICON_VIEW (cv->alphabetical_view)),
@@ -600,6 +616,12 @@
 					       NULL);
 }
 
+guint
+contacts_view_get_matched_contacts_count (ContactsView *cv)
+{
+	return cv->matched_contacts;
+}
+
 void
 contacts_view_add_contact (ContactsView *cv, const gchar *contact_name, const gchar *contact_email)
 {

=== modified file 'nautilus/contacts-view.h'
--- nautilus/contacts-view.h	2010-03-31 23:46:58 +0000
+++ nautilus/contacts-view.h	2010-04-19 21:29:17 +0000
@@ -48,6 +48,8 @@
 	/* Widgets */
 	GtkWidget *recently_used_view;
 	GtkWidget *alphabetical_view;
+
+	guint matched_contacts;
 } ContactsView;
 
 typedef struct {
@@ -64,6 +66,7 @@
 void       contacts_view_search (ContactsView *cv, const gchar *search_string);
 GSList    *contacts_view_get_selected_emails (ContactsView *cv);
 guint      contacts_view_get_contacts_count (ContactsView *cv);
+guint      contacts_view_get_matched_contacts_count (ContactsView *cv);
 void       contacts_view_add_contact (ContactsView *cv, const gchar *contact_name, const gchar *contact_email);
 
 #endif

=== modified file 'nautilus/u1-contacts-picker.c'
--- nautilus/u1-contacts-picker.c	2010-03-31 23:46:58 +0000
+++ nautilus/u1-contacts-picker.c	2010-04-19 21:29:17 +0000
@@ -84,7 +84,7 @@
 	contacts_view_search (CONTACTS_VIEW (picker->priv->contacts_view), text);
 
 	/* If no contacts offer the user to add it to the contacts database */
-	if (contacts_view_get_contacts_count (CONTACTS_VIEW (picker->priv->contacts_view)) == 0)
+	if (contacts_view_get_matched_contacts_count (CONTACTS_VIEW (picker->priv->contacts_view)) == 0)
 		gtk_widget_show (picker->priv->add_contact_button);
 	else
 		gtk_widget_hide (picker->priv->add_contact_button);

=== modified file 'nautilus/ubuntuone-nautilus.c'
--- nautilus/ubuntuone-nautilus.c	2010-04-15 15:20:43 +0000
+++ nautilus/ubuntuone-nautilus.c	2010-04-19 21:29:17 +0000
@@ -164,6 +164,12 @@
 					      GHashTable * hash,
 					      gchar * error,
 					      gpointer user_data);
+static void ubuntuone_nautilus_got_public_files (DBusGProxy * proxy,
+                                                 GPtrArray * files,
+                                                 gpointer user_data);
+static void ubuntuone_nautilus_public_files_list_error (DBusGProxy * proxy,
+                                                        gchar * error,
+                                                        gpointer user_data);
 static void ubuntuone_nautilus_share_created (DBusGProxy * proxy,
 					      GHashTable * hash,
 					      gpointer user_data);
@@ -1083,6 +1089,25 @@
   dbus_g_proxy_connect_signal (uon->u1_public, "PublicAccessChangeError",
 			       G_CALLBACK (ubuntuone_nautilus_publish_error),
 			       uon, NULL);
+
+  dbus_g_proxy_add_signal (uon->u1_public, "PublicFilesList",
+                           dbus_g_type_get_collection ("GPtrArray",
+                                                       dbus_g_type_get_map
+                                                       ("GHashTable",
+                                                        G_TYPE_STRING,
+                                                        G_TYPE_STRING)),
+                           G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal (uon->u1_public, "PublicFilesList",
+                               G_CALLBACK (ubuntuone_nautilus_got_public_files),
+                               uon, NULL);
+
+  dbus_g_proxy_add_signal (uon->u1_public, "PublicFilesListError",
+                           G_TYPE_STRING,
+                           G_TYPE_INVALID);
+  dbus_g_proxy_connect_signal (uon->u1_public, "PublicFilesListError",
+                               G_CALLBACK (ubuntuone_nautilus_public_files_list_error),
+                               uon, NULL);
+
 }
 
 static void ubuntuone_nautilus_class_init (UbuntuOneNautilusClass * klass) {
@@ -1343,11 +1368,9 @@
 					       gpointer user_data) {
   UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
   gchar * status;
-  gchar * is_online;
-  gchar * is_connected;
+  gboolean is_online;
 
-  is_online = g_hash_table_lookup (hash, "is_online");
-  is_connected = g_hash_table_lookup (hash, "is_connected");
+  is_online = g_strcmp0(g_hash_table_lookup (hash, "is_online"), "True") == 0;
   status = g_hash_table_lookup (hash, "name");
 
   /* Get the root when we get a status change signal, if we haven't yet */
@@ -1362,14 +1385,13 @@
 			     ubuntuone_nautilus_got_udfs, uon,
 			     NULL, G_TYPE_INVALID);
 
-#if 0
-  /* The following code is disabled, for the time being. lp:562443 */
   /* Get the list of public files if we haven't already */
-  if (!uon->gotpubs)
+  if (is_online && !uon->gotpubs) {
     dbus_g_proxy_begin_call (uon->u1_public, "get_public_files",
 			     ubuntuone_nautilus_end_dbus_call, uon,
 			     NULL, G_TYPE_INVALID);
-#endif
+    uon->gotpubs = TRUE;
+  }
 }
 
 static void ubuntuone_nautilus_upload_started (DBusGProxy * proxy,
@@ -1505,6 +1527,28 @@
   ubuntuone_nautilus_file_published (proxy, hash, user_data);
 }
 
+static void ubuntuone_nautilus_got_public_files (DBusGProxy * proxy,
+                                                 GPtrArray * files,
+                                                 gpointer user_data) {
+  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
+  int i;
+
+  g_hash_table_remove_all (uon->public);
+  for (i = 0; i < files->len; i++)
+    g_hash_table_insert (uon->public,
+                         g_strdup (g_hash_table_lookup (files->pdata[i], "path")),
+                         g_strdup (g_hash_table_lookup (files->pdata[i], "public_url")));
+}
+
+static void ubuntuone_nautilus_public_files_list_error (DBusGProxy * proxy,
+                                                        gchar * error,
+                                                        gpointer user_data) {
+  UbuntuOneNautilus * uon = UBUNTUONE_NAUTILUS (user_data);
+  /* the get_public_files call failed. We unset gotpubs, so the call
+  is retried when the syncdaemon next tells us it's online */
+  uon->gotpubs = FALSE;
+}
+
 static void ubuntuone_nautilus_share_created (DBusGProxy * proxy,
 					      GHashTable * hash,
 					      gpointer user_data) {

=== modified file 'tests/syncdaemon/test_localrescan.py'
--- tests/syncdaemon/test_localrescan.py	2010-04-15 15:20:43 +0000
+++ tests/syncdaemon/test_localrescan.py	2010-04-19 21:29:17 +0000
@@ -1484,6 +1484,31 @@
         self.startTest(check)
         return self.deferred
 
+    def test_SERVER_no_file(self):
+        """We just queued the Download, and it was interrupted."""
+        # create the file in metadata
+        path = os.path.join(self.share.path, "a")
+        mdid = self.fsm.create(path, self.share.volume_id, is_dir=False, node_id="uuid")
+        partial_path = os.path.join(self.fsm.partials_dir,
+                                mdid + ".u1partial." + os.path.basename(path))
+
+        # this mimic Sync.get_file
+        self.fsm.set_by_mdid(mdid, server_hash="blah-hash-blah")
+        self.fsm.create_partial("uuid", self.share.volume_id)
+
+        # now, for some reason, we lose the partial file
+        os.remove(partial_path)
+
+        def check(_):
+            """arrange the metadata so later server_rescan will do ok"""
+            self.assertEqual(self.eq.pushed, [])
+            mdobj = self.fsm.get_by_mdid(mdid)
+            self.assertFalse(mdobj.info.is_partial)
+            self.assertEqual(mdobj.server_hash, mdobj.local_hash)
+
+        self.startTest(check)
+        return self.deferred
+
     def test_SERVER_file_content(self):
         """We were downloading the file, but it was interrupted, and changed"""
         # create the file in metadata

=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
--- ubuntuone/syncdaemon/local_rescan.py	2010-04-15 15:20:43 +0000
+++ ubuntuone/syncdaemon/local_rescan.py	2010-04-19 21:29:17 +0000
@@ -507,17 +507,25 @@
                     else:
                         events.append(('FS_FILE_DELETE', fullname))
             else:
-                if changed not in ("SERVER", "NONE", "LOCAL"):
+                if changed == 'SERVER':
+                    # download interruped and partial lost
+                    log_debug("comp yield: file %r not in disk, in SERVER "
+                              "state, without partial!", fullname)
+                    mdobj = self.fsm.get_by_path(fullname)
+                    self.fsm.set_by_mdid(mdobj.mdid,
+                                         server_hash=mdobj.local_hash)
+                    self.fsm.remove_partial(mdobj.node_id, mdobj.share_id)
+                elif changed in ('NONE', 'LOCAL'):
+                    # if it had content somewhen, now is really gone (otherwise
+                    # it was never really created in the disk)
+                    log_info("comp yield: file %r is gone!", fullname)
+                    events.append(('FS_FILE_DELETE', fullname))
+                else:
                     # bad metadata
                     m = "Bad 'changed': removing MD from file %r"
                     log_debug(m, fullname)
                     self.fsm.delete_metadata(fullname)
-                    continue
 
-                # if it had content somewhen, now is gone (otherwise it was
-                # never really created in the disk)
-                log_info("comp yield: file %r is gone!", fullname)
-                events.append(('FS_FILE_DELETE', fullname))
         return events, to_scan_later
 
     def _paths_filter(self, shrinfo, dirpath, len_shr_path):