Merge lp:~dobey/ubuntu/natty/libubuntuone/release-0-9-1 into lp:ubuntu/natty/libubuntuone

[dobey]

=== modified file 'configure'
--- configure	2011-03-10 01:14:13 +0000
+++ configure	2011-03-18 20:44:28 +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.9.0.
+# Generated by GNU Autoconf 2.67 for libubuntuone 0.9.1.
 #
 #
 # 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.9.0'
-PACKAGE_STRING='libubuntuone 0.9.0'
+PACKAGE_VERSION='0.9.1'
+PACKAGE_STRING='libubuntuone 0.9.1'
 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.9.0 to adapt to many kinds of systems.
+\`configure' configures libubuntuone 0.9.1 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.9.0:";;
+     short | recursive ) echo "Configuration of libubuntuone 0.9.1:";;
    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.9.0
+libubuntuone configure 0.9.1
 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.9.0, which was
+It was created by libubuntuone $as_me 0.9.1, 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.9.0'
+ VERSION='0.9.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12750,12 +12750,12 @@
     pkg_cv_LIBUBUNTUONE_CFLAGS="$LIBUBUNTUONE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBUBUNTUONE_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2" 2>/dev/null`
+  pkg_cv_LIBUBUNTUONE_CFLAGS=`$PKG_CONFIG --cflags "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12766,12 +12766,12 @@
     pkg_cv_LIBUBUNTUONE_LIBS="$LIBUBUNTUONE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBUBUNTUONE_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2" 2>/dev/null`
+  pkg_cv_LIBUBUNTUONE_LIBS=`$PKG_CONFIG --libs "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -12791,14 +12791,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBUBUNTUONE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2" 2>&1`
+	        LIBUBUNTUONE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2" 2>&1`
         else
-	        LIBUBUNTUONE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2" 2>&1`
+	        LIBUBUNTUONE_PKG_ERRORS=`$PKG_CONFIG --print-errors "gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$LIBUBUNTUONE_PKG_ERRORS" >&5
 
-	as_fn_error $? "Package requirements (gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2) were not met:
+	as_fn_error $? "Package requirements (gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2) were not met:
 
 $LIBUBUNTUONE_PKG_ERRORS
 
@@ -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.9.0, which was
+This file was extended by libubuntuone $as_me 0.9.1, 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.9.0
+libubuntuone config.status 0.9.1
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 

=== modified file 'configure.ac'
--- configure.ac	2011-03-10 01:13:12 +0000
+++ configure.ac	2011-03-18 20:44:28 +0000
@@ -1,4 +1,4 @@
-AC_INIT([libubuntuone], [0.9.0], [], [libubuntuone])
+AC_INIT([libubuntuone], [0.9.1], [], [libubuntuone])
 
 AC_PREREQ([2.59])
 
@@ -32,7 +32,7 @@
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 dnl Look for needed modules
-PKG_CHECK_MODULES(LIBUBUNTUONE, gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 gnome-keyring-1 dbus-glib-1 libxml-2.0 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2)
+PKG_CHECK_MODULES(LIBUBUNTUONE, gdk-pixbuf-2.0 webkit-1.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2)
 AC_SUBST(LIBUBUNTUONE_CFLAGS)
 AC_SUBST(LIBUBUNTUONE_LIBS)
 

=== modified file 'data/u1-preview.js'
--- data/u1-preview.js	2010-04-01 17:42:58 +0000
+++ data/u1-preview.js	2011-03-18 20:44:28 +0000
@@ -53,7 +53,7 @@
 	// add a padlock if this is a secure page
 	if (location.href.substr(0,6) == "https:") {
 	    var padlock = document.createElement("img");
-	    padlock.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAYAAACwXJejAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAINJREFUeNpiTEtLYwACfiCeBsQ2QCwHxK%2BBeB8QZwHxOyYGCOgFYl0gjgNiQyD2B2IJIJ4DkmSBKvIGYjcgvsyAAOlAfAzEgJkkCsQ3GVDBI6gzwIp4gJgZiH%2BhKfoOFQdb9xkq%2BJ8BO/jPxEAEGABFTwmoeQpSlALEL3AoAImnAAQYAHZ7FWCCovUtAAAAAElFTkSuQmCC";
+	    padlock.src = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAkAAAAMCAYAAACwXJejAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAINJREFUeNpiTEtLYwACfiCeBsQ2QCwHxK+BeB8QZwHxOyYGCOgFYl0gjgNiQyD2B2IJIJ4DkmSBKvIGYjcgvsyAAOlAfAzEgJkkCsQ3GVDBI6gzwIp4gJgZiH+hKfoOFQdb9xkq+J8BO/jPxEAEGABFTwmoeQpSlALEL3AoAImnAAQYAHZ7FWCCovUtAAAAAElFTkSuQmCC";
 	    padlock.style.position = "fixed";
 	    padlock.style.bottom = "0";
 	    padlock.style.right = "0";

=== modified file 'debian/changelog'
--- debian/changelog	2011-03-10 01:14:13 +0000
+++ debian/changelog	2011-03-18 20:44:28 +0000
@@ -1,3 +1,15 @@
+libubuntuone (0.9.1-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    - Remove unneeded dbus-glib usage (LP: #732761)
+    - Custom URI scheme handler for internal pages (LP: #733479)
+    - False connection error message (LP: #596394)
+    - Notify user when purchased folder is not subscribed to (LP: #727558)
+    - Memory leak in navigation_requested_cb (LP: #733283)
+    - Lock icon is broken in store pages (LP: #733308)
+
+ -- Rodney Dawes <[e-mail]>  Fri, 18 Mar 2011 16:30:19 -0400
+
 libubuntuone (0.9.0-0ubuntu1) natty; urgency=low
 
   * New upstream release.

=== modified file 'debian/control'
--- debian/control	2011-02-11 21:56:37 +0000
+++ debian/control	2011-03-18 20:44:28 +0000
@@ -18,9 +18,7 @@
                python-gtk2-dev,
                python-gobject-dev,
                libssl-dev,
-               libgnome-keyring-dev,
                libxml2-dev,
-               libdbus-glib-1-dev,
                mono-gmcs,
                gtk-sharp2-gapi,
                cli-common-dev (>= 0.5.7),

=== modified file 'libubuntuone/Makefile.am'
--- libubuntuone/Makefile.am	2011-01-14 22:24:48 +0000
+++ libubuntuone/Makefile.am	2011-03-18 20:44:28 +0000
@@ -20,6 +20,8 @@
 	oauth.c			\
 	oauth.h			\
 	u1-music-store.c	\
+	u1-request-chrome.c	\
+	u1-request-chrome.h	\
 	xmalloc.c		\
 	xmalloc.h
 libubuntuone_1_0_la_LDFLAGS = -version-info $(LIBUBUNTUONE_CURRENT):$(LIBUBUNTUONE_REVISION):$(LIBUBUNTUONE_AGE)

=== modified file 'libubuntuone/Makefile.in'
--- libubuntuone/Makefile.in	2011-01-14 22:29:52 +0000
+++ libubuntuone/Makefile.in	2011-03-18 20:44:28 +0000
@@ -79,7 +79,7 @@
 	$(am__DEPENDENCIES_1)
 am__objects_1 = u1-marshal.lo
 am_libubuntuone_1_0_la_OBJECTS = $(am__objects_1) oauth.lo \
-	u1-music-store.lo xmalloc.lo
+	u1-music-store.lo u1-request-chrome.lo xmalloc.lo
 libubuntuone_1_0_la_OBJECTS = $(am_libubuntuone_1_0_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY))
@@ -319,6 +319,8 @@
 	oauth.c			\
 	oauth.h			\
 	u1-music-store.c	\
+	u1-request-chrome.c	\
+	u1-request-chrome.h	\
 	xmalloc.c		\
 	xmalloc.h
 
@@ -426,6 +428,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/oauth.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u1-marshal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u1-music-store.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/u1-request-chrome.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmalloc.Plo@am__quote@
 
 .c.o:

=== modified file 'libubuntuone/u1-marshal.c'
--- libubuntuone/u1-marshal.c	2010-07-21 15:39:51 +0000
+++ libubuntuone/u1-marshal.c	2011-03-18 20:44:28 +0000
@@ -49,44 +49,7 @@
 #endif /* !G_ENABLE_DEBUG */
 
 
-/* NONE:STRING,OBJECT (u1-marshal.list:1) */
-void
-_u1_marshal_VOID__STRING_OBJECT (GClosure     *closure,
-                                 GValue       *return_value G_GNUC_UNUSED,
-                                 guint         n_param_values,
-                                 const GValue *param_values,
-                                 gpointer      invocation_hint G_GNUC_UNUSED,
-                                 gpointer      marshal_data)
-{
-  typedef void (*GMarshalFunc_VOID__STRING_OBJECT) (gpointer     data1,
-                                                    gpointer     arg_1,
-                                                    gpointer     arg_2,
-                                                    gpointer     data2);
-  register GMarshalFunc_VOID__STRING_OBJECT callback;
-  register GCClosure *cc = (GCClosure*) closure;
-  register gpointer data1, data2;
-
-  g_return_if_fail (n_param_values == 3);
-
-  if (G_CCLOSURE_SWAP_DATA (closure))
-    {
-      data1 = closure->data;
-      data2 = g_value_peek_pointer (param_values + 0);
-    }
-  else
-    {
-      data1 = g_value_peek_pointer (param_values + 0);
-      data2 = closure->data;
-    }
-  callback = (GMarshalFunc_VOID__STRING_OBJECT) (marshal_data ? marshal_data : cc->callback);
-
-  callback (data1,
-            g_marshal_value_peek_string (param_values + 1),
-            g_marshal_value_peek_object (param_values + 2),
-            data2);
-}
-
-/* NONE:STRING,STRING (u1-marshal.list:2) */
+/* NONE:STRING,STRING (u1-marshal.list:1) */
 void
 _u1_marshal_VOID__STRING_STRING (GClosure     *closure,
                                  GValue       *return_value G_GNUC_UNUSED,

=== modified file 'libubuntuone/u1-marshal.h'
--- libubuntuone/u1-marshal.h	2010-02-16 20:56:56 +0000
+++ libubuntuone/u1-marshal.h	2011-03-18 20:44:28 +0000
@@ -6,16 +6,7 @@
 
 G_BEGIN_DECLS
 
-/* NONE:STRING,OBJECT (u1-marshal.list:1) */
-extern void _u1_marshal_VOID__STRING_OBJECT (GClosure     *closure,
-                                             GValue       *return_value,
-                                             guint         n_param_values,
-                                             const GValue *param_values,
-                                             gpointer      invocation_hint,
-                                             gpointer      marshal_data);
-#define _u1_marshal_NONE__STRING_OBJECT	_u1_marshal_VOID__STRING_OBJECT
-
-/* NONE:STRING,STRING (u1-marshal.list:2) */
+/* NONE:STRING,STRING (u1-marshal.list:1) */
 extern void _u1_marshal_VOID__STRING_STRING (GClosure     *closure,
                                              GValue       *return_value,
                                              guint         n_param_values,

=== modified file 'libubuntuone/u1-marshal.list'
--- libubuntuone/u1-marshal.list	2009-12-21 13:09:23 +0000
+++ libubuntuone/u1-marshal.list	2011-03-18 20:44:28 +0000
@@ -1,2 +1,1 @@
-NONE:STRING,OBJECT
 NONE:STRING,STRING

=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-03-10 01:13:12 +0000
+++ libubuntuone/u1-music-store.c	2011-03-18 20:44:28 +0000
@@ -24,13 +24,13 @@
 #include <libxml/HTMLparser.h>
 #include <glib/gi18n.h>
 #include <webkit/webkit.h>
-#include <dbus/dbus-glib.h>
 #include <libsoup/soup-gnome-features.h>
 #include <libsoup/soup-uri.h>
 #include <libsyncdaemon/libsyncdaemon.h>
 #include "oauth.h"
 #include "u1-music-store.h"
 #include "u1-marshal.h"
+#include "u1-request-chrome.h"
 
 #define U1_MUSIC_LIBRARY_LOCATION  ".ubuntuone/Purchased from Ubuntu One"
 
@@ -50,7 +50,6 @@
 #define MAXIMUM_AUTH_RETRIES 5
 
 struct _U1MusicStorePrivate {
-	DBusGConnection *bus;
 	SyncdaemonDaemon *syncdaemon;
 	gchar *base_url;
 
@@ -60,6 +59,14 @@
 	WebKitWebFrame *frame_to_use;
 	GtkWidget *progress;
 
+	/* Alert bar widgets
+	 * We use two button widgets here, to avoid overlapping conditions
+	 */
+	GtkWidget *alertbar;
+	GtkWidget *alert_label;
+	GtkWidget *subscribe_btn;
+	gboolean folder_subscribed;
+
 	guint watch_id;
 	guint idle_cb;
 	GHashTable *watched_downloads;
@@ -97,9 +104,6 @@
 		if (music_store->priv->base_url != NULL)
 			g_free (music_store->priv->base_url);
 
-		if (music_store->priv->bus != NULL)
-			dbus_g_connection_unref (music_store->priv->bus);
-
 		if (music_store->priv->syncdaemon != NULL)
 			g_object_unref (G_OBJECT (music_store->priv->syncdaemon));
 
@@ -237,7 +241,7 @@
 
 	*oauth_consumer_token = *oauth_consumer_secret = *oauth_token = *oauth_token_secret = NULL;
 
-	/* Get the OAuth token from the keyring */
+	/* Get the OAuth token from the SSO client */
 	if ((credentials = syncdaemon_authentication_find_credentials (
 		     syncdaemon_daemon_get_authentication (music_store->priv->syncdaemon)))) {
 		*oauth_consumer_token = g_strdup (syncdaemon_credentials_get_consumer_key (credentials));
@@ -508,6 +512,7 @@
 	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
 	SoupURI *parsed_uri;
 	gchar *internal_uri;
+	gboolean return_val = FALSE;
 
 	/* Remove watching callback for the page */
 	if (music_store->priv->watch_id != 0) {
@@ -547,7 +552,7 @@
 			g_debug ("overriding the library page to ours");
 			load_delayed_page (web_view, library_override, policy_decision);
 
-			return TRUE;
+			return_val = TRUE;
 		}
 	} else if (!g_strcmp0 ((const gchar *) parsed_uri->host, "www.7digital.com")) {
 		/* host is 7digital.com. It must be in our store. */
@@ -566,7 +571,7 @@
 			g_free (internal_uri);
 			g_free (to_and_from_error_uris);
 
-			return TRUE;
+			return_val = TRUE;
 		}
 	} else if (!g_strcmp0 ((const gchar *) parsed_uri->host, "one.ubuntu.com")) {
 		/* host is one.ubuntu.com. It must not be the login page */
@@ -593,7 +598,7 @@
 			g_free (internal_uri);
 			g_free (to_and_from_error_uris);
 
-			return TRUE;
+			return_val = TRUE;
 		}
 	} else if (!g_strcmp0 ((const gchar *) parsed_uri->host, "login.ubuntu.com")) {
 		gchar *real_url;
@@ -618,13 +623,13 @@
 		g_free (internal_uri);
 		g_free (to_and_from_error_uris);
 
-		return TRUE;
+		return_val = TRUE;
 	}
 
 	/* Free memory */
 	soup_uri_free (parsed_uri);
 
-	return FALSE;
+	return return_val;
 }
 
 static void
@@ -824,8 +829,10 @@
 load_finished_cb (WebKitWebView *web_view, WebKitWebFrame *frame, gpointer user_data)
 {
 	const gchar *library_override;
-	gchar *tmp_url;
 	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+	SoupURI * uri;
+
+	uri = soup_uri_new (webkit_web_view_get_uri (web_view));
 
 	/* Remove the initial view if still around */
 	if (music_store->priv->initial_web_viewer != NULL) {
@@ -846,8 +853,15 @@
 		execute_script (web_view, "u1-library-override.js", library_override);
 
 	/* If the URL just loaded is the library page, update download status */
-	tmp_url = g_strdup_printf ("%s%s", music_store->priv->base_url, U1_LIBRARY_URL);
-	if (g_str_has_prefix (webkit_web_view_get_uri (web_view), tmp_url)) {
+	if (g_str_has_prefix (uri->path, U1_LIBRARY_URL)) {
+		/* Show the alert bar if folder is unsubscribed */
+		if (!music_store->priv->folder_subscribed) {
+			gtk_label_set_text (GTK_LABEL (music_store->priv->alert_label),
+					    _("Your 'Purchased Music' folder is not subscribed. New purchases will not download to this computer."));
+			gtk_widget_show (music_store->priv->subscribe_btn);
+			gtk_widget_show (music_store->priv->alertbar);
+		}
+
 		/* Inject JavaScript to make songs clickable 
 		   Needs to be done before update-status-in-library-page */
 		execute_script (web_view, "u1-songs-clickable.js", NULL);
@@ -859,13 +873,13 @@
 		music_store->priv->watch_id = g_timeout_add (1000, (GSourceFunc) poll_downloads_cb, music_store);
 	}
 
-	g_free (tmp_url);
-
 	/* Signal users the URL finished loading */
 	gtk_widget_hide (music_store->priv->progress);
 
 	g_signal_emit (music_store, u1_music_store_signals[URL_LOADED_SIGNAL], 0,
 		       (const gchar *) webkit_web_view_get_uri (WEBKIT_WEB_VIEW (music_store->priv->web_viewer)));
+
+	soup_uri_free (uri);
 }
 
 static void
@@ -902,9 +916,12 @@
 static gboolean
 load_error_cb (WebKitWebView *web_view, WebKitWebFrame *frame, const gchar *uri, GError *error, gpointer user_data)
 {
-	load_internal_html_page (web_view, U1_DEFAULT_ERROR_PAGE, uri);
+	if (error->domain == WEBKIT_NETWORK_ERROR) {
+		load_internal_html_page (web_view, U1_DEFAULT_ERROR_PAGE, uri);
+		return TRUE;
+	}
 
-	return TRUE;
+	return FALSE;
 }
 
 static gboolean
@@ -944,11 +961,40 @@
 }
 
 static void
+sd_folder_subscribed_cb (SyncdaemonDaemon *daemon, gboolean success,
+			 SyncdaemonFolderInfo *folder_info, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+	const gchar *new_path = syncdaemon_folder_info_get_path (folder_info);
+	const gchar *lib_path = u1_music_store_get_library_location (music_store);
+
+	if (success && g_strcmp0 (new_path, lib_path) == 0) {
+		music_store->priv->folder_subscribed = TRUE;
+		gtk_widget_hide (music_store->priv->subscribe_btn);
+		gtk_widget_hide (music_store->priv->alertbar);
+	}
+}
+
+static void
+subscribe_purchased_folder (GtkButton *button, gpointer user_data)
+{
+	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
+	SyncdaemonFolderInfo *folder_info;
+
+	folder_info = syncdaemon_daemon_get_folder_info (music_store->priv->syncdaemon,
+							 u1_music_store_get_library_location (music_store));
+	syncdaemon_daemon_subscribe_folder (music_store->priv->syncdaemon,
+					    syncdaemon_folder_info_get_volume_id (folder_info));
+}
+
+static void
 u1_music_store_init (U1MusicStore *music_store)
 {
 	gchar *new_user_agent;
 	const gchar *url_to_use;
-	GError *error = NULL;
+	SoupSession *session;
+	GtkWidget *alert_icon;
+	SyncdaemonFolderInfo *folder_info;
 
 	if (!g_thread_get_initialized ())
 		g_thread_init (NULL);
@@ -957,32 +1003,16 @@
 	music_store->priv->watched_downloads = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 	music_store->priv->syncdaemon = syncdaemon_daemon_new ();
 
+	g_signal_connect (G_OBJECT (music_store->priv->syncdaemon),
+			  "folder_subscribed",
+			  G_CALLBACK (sd_folder_subscribed_cb), music_store);
+
 	/* If U1MUSICSTOREURL is defined, use that instead of the real URL */
 	if (! (url_to_use = g_getenv ("U1MUSICSTOREURL")))
 		url_to_use = "https://one.ubuntu.com";
 
 	music_store->priv->base_url = g_strdup (url_to_use);
 
-	/* Initialize DBus */
-	music_store->priv->bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
-	if (error) {
-		g_warning ("Couldn't get session bus: %s", error->message);
-		g_error_free (error);
-
-	}
-
-	dbus_g_object_register_marshaller (_u1_marshal_VOID__STRING_STRING,
-					   G_TYPE_NONE,
-					   G_TYPE_STRING, G_TYPE_STRING,
-					   G_TYPE_INVALID);
-	dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__VOID,
-					   G_TYPE_NONE,
-					   G_TYPE_INVALID);
-	dbus_g_object_register_marshaller (g_cclosure_marshal_VOID__STRING,
-					   G_TYPE_NONE,
-					   G_TYPE_STRING,
-					   G_TYPE_INVALID);
-
 	/* Create web viewer object */
 	music_store->priv->scroll = gtk_scrolled_window_new (NULL, NULL);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (music_store->priv->scroll),
@@ -1002,8 +1032,13 @@
 		      NULL);
 	g_free(new_user_agent);
 
+	session = webkit_get_default_session ();
+
 	/* Use GNOME proxy settings */
-	soup_session_add_feature_by_type (webkit_get_default_session (), SOUP_TYPE_PROXY_RESOLVER_GNOME);
+	soup_session_add_feature_by_type (session, SOUP_TYPE_PROXY_RESOLVER_GNOME);
+
+	/* Add our handler for u1chrome: URIs */
+	soup_session_add_feature_by_type (session, U1_TYPE_REQUEST_CHROME);
 
 	g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "navigation-policy-decision-requested",
 				  G_CALLBACK (navigation_requested_cb), music_store);
@@ -1024,6 +1059,34 @@
 	gtk_widget_show (music_store->priv->initial_web_viewer);
 	gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->initial_web_viewer);
 
+	/* Create the alert bar */
+	music_store->priv->alertbar = gtk_hbox_new (FALSE, 12);
+	alert_icon = gtk_image_new_from_stock (GTK_STOCK_DIALOG_WARNING,
+					       GTK_ICON_SIZE_MENU);
+	gtk_box_pack_start (GTK_BOX (music_store->priv->alertbar), alert_icon,
+			    FALSE, FALSE, 0);
+	gtk_widget_show (alert_icon);
+
+	music_store->priv->alert_label = gtk_label_new ("");
+	gtk_misc_set_alignment (GTK_MISC (music_store->priv->alert_label),
+				0.0, 0.5);
+	gtk_box_pack_start (GTK_BOX (music_store->priv->alertbar),
+			    music_store->priv->alert_label,
+			    TRUE, TRUE, 0);
+	gtk_widget_show (music_store->priv->alert_label);
+
+	/* Button to subscribe the Purchased Music folder */
+	music_store->priv->subscribe_btn = gtk_button_new_with_label (_("Subscribe"));
+	gtk_box_pack_end (GTK_BOX (music_store->priv->alertbar),
+			  music_store->priv->subscribe_btn,
+			  FALSE, FALSE, 6);
+	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 ();
 	
@@ -1033,8 +1096,9 @@
 	/* 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->scroll, TRUE, TRUE, 3);
-	gtk_box_pack_start (GTK_BOX (music_store), music_store->priv->progress, FALSE, FALSE, 3);
+	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);
 }
 
 /**

=== added file 'libubuntuone/u1-request-chrome.c'
--- libubuntuone/u1-request-chrome.c	1970-01-01 00:00:00 +0000
+++ libubuntuone/u1-request-chrome.c	2011-03-18 20:44:28 +0000
@@ -0,0 +1,90 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <gio/gio.h>
+#include <glib/gi18n-lib.h>
+#include <libsoup/soup-uri.h>
+
+#include "u1-request-chrome.h"
+
+static GInputStream *u1_request_chrome_send (SoupRequest *request,
+                                             GCancellable *cancellable,
+                                             GError **error);
+static goffset u1_request_chrome_get_content_length (SoupRequest *request);
+static const gchar *u1_request_chrome_get_content_type (SoupRequest *request);
+
+G_DEFINE_TYPE (U1RequestChrome, u1_request_chrome, SOUP_TYPE_REQUEST)
+
+/* The URI schemes we handle */
+static const gchar *chrome_schemes[] = { "u1chrome", NULL };
+
+struct _U1RequestChromePrivate {
+};
+
+static void
+u1_request_chrome_init (U1RequestChrome *chrome)
+{
+    chrome->priv = G_TYPE_INSTANCE_GET_PRIVATE (chrome, U1_TYPE_REQUEST_CHROME, U1RequestChromePrivate);
+}
+
+static void
+u1_request_chrome_class_init (U1RequestChromeClass *klass)
+{
+    SoupRequestClass *request_class = SOUP_REQUEST_CLASS (klass);
+
+    request_class->schemes = chrome_schemes;
+
+    g_type_class_add_private (klass, sizeof (U1RequestChromeClass));
+
+    request_class->send = u1_request_chrome_send;
+    request_class->get_content_length = u1_request_chrome_get_content_length;
+    request_class->get_content_type = u1_request_chrome_get_content_type;
+}
+
+static GInputStream *
+u1_request_chrome_send (SoupRequest *request,
+                        GCancellable *cancellable,
+                        GError **error)
+{
+    SoupURI *uri = soup_request_get_uri (request);
+    gchar *data;
+
+    if (uri->path && !g_ascii_strcasecmp (uri->path, "empty"))
+        data = g_strdup ("");
+    else
+        data = g_strdup ("");
+
+    return g_memory_input_stream_new_from_data (data, strlen (data), g_free);
+}
+
+static goffset
+u1_request_chrome_get_content_length (SoupRequest *request)
+{
+    return -1;
+}
+
+static const gchar *
+u1_request_chrome_get_content_type (SoupRequest *request)
+{
+    return "text/plain";
+}

=== added file 'libubuntuone/u1-request-chrome.h'
--- libubuntuone/u1-request-chrome.h	1970-01-01 00:00:00 +0000
+++ libubuntuone/u1-request-chrome.h	2011-03-18 20:44:28 +0000
@@ -0,0 +1,49 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2011 Canonical, Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 2 of the GNU Lesser General Public
+ * License as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __U1_REQUEST_CHROME_H__
+#define __U1_REQUEST_CHROME_H__
+
+#define LIBSOUP_USE_UNSTABLE_REQUEST_API
+#include <libsoup/soup-request.h>
+
+#define U1_TYPE_REQUEST_CHROME            (u1_request_chrome_get_type ())
+#define U1_REQUEST_CHROME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), U1_TYPE_REQUEST_CHROME, U1RequestChrome))
+#define U1_IS_REQUEST_CHROME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), U1_TYPE_REQUEST_CHROME))
+#define U1_REQUEST_CHROME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), U1_TYPE_REQUEST_CHROME, U1RequestChrome))
+#define U1_IS_REQUEST_CHROME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), U1_TYPE_REQUEST_CHROME))
+#define U1_REQUEST_CHROME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), U1_TYPE_REQUEST_CHROME, U1RequestChrome))
+
+typedef struct _U1RequestChrome        U1RequestChrome;
+typedef struct _U1RequestChromeClass   U1RequestChromeClass;
+typedef struct _U1RequestChromePrivate U1RequestChromePrivate;
+
+struct _U1RequestChrome {
+	SoupRequest parent;
+
+    U1RequestChromePrivate *priv;
+};
+
+struct _U1RequestChromeClass {
+    SoupRequestClass parent_class;
+};
+
+GType u1_request_chrome_get_type (void);
+
+#endif