Merge lp:~dobey/ubuntu/oneiric/libubuntuone/release-0110 into lp:ubuntu/oneiric/libubuntuone

[dobey]

=== modified file 'configure'
--- configure	2011-04-15 20:56:10 +0000
+++ configure	2011-09-13 19:37:24 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for libubuntuone 0.10.0.
+# Generated by GNU Autoconf 2.67 for libubuntuone 0.11.0.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -698,8 +698,8 @@
 # Identity of this package.
 PACKAGE_NAME='libubuntuone'
 PACKAGE_TARNAME='libubuntuone'
-PACKAGE_VERSION='0.10.0'
-PACKAGE_STRING='libubuntuone 0.10.0'
+PACKAGE_VERSION='0.11.0'
+PACKAGE_STRING='libubuntuone 0.11.0'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1535,7 +1535,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 libubuntuone 0.10.0 to adapt to many kinds of systems.
+\`configure' configures libubuntuone 0.11.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1605,7 +1605,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libubuntuone 0.10.0:";;
+     short | recursive ) echo "Configuration of libubuntuone 0.11.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1730,7 +1730,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libubuntuone configure 0.10.0
+libubuntuone configure 0.11.0
 generated by GNU Autoconf 2.67
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2095,7 +2095,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libubuntuone $as_me 0.10.0, which was
+It was created by libubuntuone $as_me 0.11.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   $ $0 $@
@@ -2918,7 +2918,7 @@
 
 # Define the identity of the package.
  PACKAGE='libubuntuone'
- VERSION='0.10.0'
+ VERSION='0.11.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14638,7 +14638,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libubuntuone $as_me 0.10.0, which was
+This file was extended by libubuntuone $as_me 0.11.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14704,7 +14704,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libubuntuone config.status 0.10.0
+libubuntuone config.status 0.11.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-04-15 20:54:53 +0000
+++ configure.ac	2011-09-13 19:37:24 +0000
@@ -1,4 +1,4 @@
-AC_INIT([libubuntuone], [0.10.0], [], [libubuntuone])
+AC_INIT([libubuntuone], [0.11.0], [], [libubuntuone])
 
 AC_PREREQ([2.59])
 

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-24 18:07:25 +0000
+++ debian/changelog	2011-09-13 19:37:24 +0000
@@ -1,3 +1,10 @@
+libubuntuone (0.11.0-0ubuntu1) oneiric; urgency=low
+
+  * New upstream release.
+    - Dely initial rescan of purchased music folder for 10s (LP: #788532)
+
+ -- Rodney Dawes <[e-mail]>  Tue, 13 Sep 2011 15:30:33 -0400
+
 libubuntuone (0.10.0-0ubuntu4) oneiric; urgency=low
 
   * debian/control: Fix gir1.2-json-glib-1.0 → gir1.2-json-1.0 build

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-04-15 20:54:53 +0000
+++ libubuntuone/u1-music-store.c	2011-09-13 19:37:24 +0000
@@ -1221,6 +1221,34 @@
 					 music_store);
 }
 
+static gboolean
+_u1_music_store_delayed_init (gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+	SyncdaemonFolderInfo *folder_info;
+
+	/* Figure out if the Purchased Music folder is subscribed */
+	folder_info = syncdaemon_daemon_get_folder_info (music_store->priv->syncdaemon, u1_music_store_get_library_location (music_store));
+	music_store->priv->folder_subscribed = syncdaemon_folder_info_get_subscribed (folder_info);
+
+	/* Create a hidden progress bar */
+	music_store->priv->progress = gtk_progress_bar_new ();
+	
+	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify",
+			  G_CALLBACK (viewer_property_changed_cb), music_store);
+
+	/* And load the real store in the background */
+	music_store->priv->idle_cb = g_idle_add ((GSourceFunc) load_real_store_cb, music_store);
+
+	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->alertbar, FALSE, FALSE, 6);
+	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->scroll, TRUE, TRUE, 0);
+	gtk_box_pack_end (GTK_BOX (music_store), music_store->priv->progress, FALSE, FALSE, 0);
+
+	_u1_music_store_rescan_purchased_folder (music_store);
+
+	return FALSE;
+}
+
 static void
 u1_music_store_init (U1MusicStore *music_store)
 {
@@ -1228,7 +1256,6 @@
 	const gchar *url_to_use;
 	SoupSession *session;
 	GtkWidget *alert_icon;
-	SyncdaemonFolderInfo *folder_info;
 
 	if (!g_thread_get_initialized ())
 		g_thread_init (NULL);
@@ -1343,24 +1370,8 @@
 	g_signal_connect (G_OBJECT (music_store->priv->subscribe_btn), "clicked",
 			  G_CALLBACK (subscribe_purchased_folder), music_store);
 
-	/* Figure out if the Purchased Music folder is subscribed */
-	folder_info = syncdaemon_daemon_get_folder_info (music_store->priv->syncdaemon, u1_music_store_get_library_location (music_store));
-	music_store->priv->folder_subscribed = syncdaemon_folder_info_get_subscribed (folder_info);
-
-	/* Create a hidden progress bar */
-	music_store->priv->progress = gtk_progress_bar_new ();
-	
-	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify",
-			  G_CALLBACK (viewer_property_changed_cb), music_store);
-
-	/* And load the real store in the background */
-	music_store->priv->idle_cb = g_idle_add ((GSourceFunc) load_real_store_cb, music_store);
-
-	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->alertbar, FALSE, FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->scroll, TRUE, TRUE, 0);
-	gtk_box_pack_end (GTK_BOX (music_store), music_store->priv->progress, FALSE, FALSE, 0);
-
-	_u1_music_store_rescan_purchased_folder (music_store);
+	g_timeout_add_seconds(10, (GSourceFunc) _u1_music_store_delayed_init,
+			      music_store);
 }
 
 /**