diff -Nru libubuntuone-2.99.5/aclocal.m4 libubuntuone-2.99.90/aclocal.m4 --- libubuntuone-2.99.5/aclocal.m4 2012-02-21 19:14:10.000000000 +0000 +++ libubuntuone-2.99.90/aclocal.m4 2012-03-07 14:55:33.000000000 +0000 @@ -568,6 +568,8 @@ ],dnl [auto],[dnl PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + dnl Canonicalize enable_introspection + enable_introspection=$found_introspection ],dnl [dnl AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) diff -Nru libubuntuone-2.99.5/configure libubuntuone-2.99.90/configure --- libubuntuone-2.99.5/configure 2012-02-21 19:14:11.000000000 +0000 +++ libubuntuone-2.99.90/configure 2012-03-07 14:55:34.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for libubuntuone 2.99.5. +# Generated by GNU Autoconf 2.68 for libubuntuone 2.99.90. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -567,8 +567,8 @@ # Identity of this package. PACKAGE_NAME='libubuntuone' PACKAGE_TARNAME='libubuntuone' -PACKAGE_VERSION='2.99.5' -PACKAGE_STRING='libubuntuone 2.99.5' +PACKAGE_VERSION='2.99.90' +PACKAGE_STRING='libubuntuone 2.99.90' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1385,7 +1385,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 2.99.5 to adapt to many kinds of systems. +\`configure' configures libubuntuone 2.99.90 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1455,7 +1455,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libubuntuone 2.99.5:";; + short | recursive ) echo "Configuration of libubuntuone 2.99.90:";; esac cat <<\_ACEOF @@ -1579,7 +1579,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libubuntuone configure 2.99.5 +libubuntuone configure 2.99.90 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1944,7 +1944,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 2.99.5, which was +It was created by libubuntuone $as_me 2.99.90, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -2767,7 +2767,7 @@ # Define the identity of the package. PACKAGE='libubuntuone' - VERSION='2.99.5' + VERSION='2.99.90' cat >>confdefs.h <<_ACEOF @@ -14174,6 +14174,7 @@ else found_introspection=no fi + enable_introspection=$found_introspection ;; #( *) : as_fn_error $? "invalid argument passed to --enable-introspection, should be one of [no/auto/yes]" "$LINENO" 5 @@ -14809,7 +14810,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 2.99.5, which was +This file was extended by libubuntuone $as_me 2.99.90, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14875,7 +14876,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 2.99.5 +libubuntuone config.status 2.99.90 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -Nru libubuntuone-2.99.5/configure.ac libubuntuone-2.99.90/configure.ac --- libubuntuone-2.99.5/configure.ac 2012-02-21 19:12:55.000000000 +0000 +++ libubuntuone-2.99.90/configure.ac 2012-03-07 14:55:18.000000000 +0000 @@ -1,4 +1,4 @@ -AC_INIT([libubuntuone], [2.99.5], [], [libubuntuone]) +AC_INIT([libubuntuone], [2.99.90], [], [libubuntuone]) AC_PREREQ([2.59]) diff -Nru libubuntuone-2.99.5/debian/changelog libubuntuone-2.99.90/debian/changelog --- libubuntuone-2.99.5/debian/changelog 2012-02-21 22:11:23.000000000 +0000 +++ libubuntuone-2.99.90/debian/changelog 2012-03-07 19:06:42.000000000 +0000 @@ -1,3 +1,14 @@ +libubuntuone (2.99.90-0ubuntu1) precise; urgency=low + + * New upstream release. + - Avoid a Gtk-CRITICAL on start-up (LP: #947477) + - Fix race conditions on start-up when loading u1ms urls (LP: #933010) + - Avoid a libsoup-WARNING on start-up (LP: #947480) + * debian/watch: + - Update for new stable release. + + -- Rodney Dawes Wed, 07 Mar 2012 14:03:02 -0500 + libubuntuone (2.99.5-0ubuntu1) precise; urgency=low * New upstream release. diff -Nru libubuntuone-2.99.5/debian/watch libubuntuone-2.99.90/debian/watch --- libubuntuone-2.99.5/debian/watch 2012-02-21 22:09:17.000000000 +0000 +++ libubuntuone-2.99.90/debian/watch 2012-03-07 19:01:56.000000000 +0000 @@ -1,3 +1,3 @@ #watch file for libubuntuone version=3 -http://launchpad.net/libubuntuone/stable-3-0/2.99.5 .*/libubuntuone-([0-9.]+).tar.gz +http://launchpad.net/libubuntuone/stable-3-0/2.99.90 .*/libubuntuone-([0-9.]+).tar.gz diff -Nru libubuntuone-2.99.5/libubuntuoneui/u1-music-store.c libubuntuone-2.99.90/libubuntuoneui/u1-music-store.c --- libubuntuone-2.99.5/libubuntuoneui/u1-music-store.c 2012-01-31 22:52:54.000000000 +0000 +++ libubuntuone-2.99.90/libubuntuoneui/u1-music-store.c 2012-03-07 14:55:05.000000000 +0000 @@ -544,12 +544,13 @@ music_store->priv->watched_downloads = NULL; } + network_uri = webkit_network_request_get_uri (request); + /* Capture URLs we're interested in */ - parsed_uri = soup_uri_new (webkit_network_request_get_uri (request)); + parsed_uri = soup_uri_new (network_uri); if (parsed_uri == NULL) return FALSE; - network_uri = webkit_network_request_get_uri (request); if (network_uri != NULL && g_str_has_prefix (network_uri, U1_NOT_REGISTERED_URL)) { fire_authentication (music_store, request, policy_decision); } else if (g_str_has_prefix (parsed_uri->path, "/auth/login") && @@ -561,7 +562,6 @@ fire_authentication (music_store, request, policy_decision); } else if (g_strrstr (parsed_uri->path, "library.aspx") != NULL || g_str_has_prefix (parsed_uri->path, "/music/store/library")) { - //g_str_has_prefix (webkit_network_request_get_uri (request), "https://one.ubuntu.com/music/store/library")) { const gchar *library_override; /* If the URL being loaded is the 7d library page, and we have a library @@ -1222,9 +1222,6 @@ 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); - g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify", - G_CALLBACK (viewer_property_changed_cb), music_store); - /* Rescan the purchased music folder */ _u1_music_store_rescan_purchased_folder (music_store); @@ -1266,6 +1263,9 @@ music_store->priv->base_url = g_strdup (url_to_use); + /* Create a hidden progress bar */ + music_store->priv->progress = gtk_progress_bar_new (); + /* 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), @@ -1291,9 +1291,6 @@ /* Use GNOME proxy settings */ 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); g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "load-finished", @@ -1303,9 +1300,9 @@ g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "load-error", G_CALLBACK (load_error_cb), music_store); - /* Show a temp view when loading the initial store page */ - load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), - U1_CONNECTING_PAGE, NULL); + g_signal_connect (G_OBJECT (music_store->priv->web_viewer), "notify", + G_CALLBACK (viewer_property_changed_cb), music_store); + gtk_widget_show (music_store->priv->web_viewer); gtk_container_add (GTK_CONTAINER (music_store->priv->scroll), music_store->priv->web_viewer); @@ -1344,19 +1341,20 @@ g_signal_connect (G_OBJECT (music_store->priv->subscribe_btn), "clicked", G_CALLBACK (subscribe_purchased_folder), music_store); - /* Create a hidden progress bar */ - music_store->priv->progress = gtk_progress_bar_new (); - 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); + /* Load the temporary connecting page */ + load_internal_html_page (WEBKIT_WEB_VIEW (music_store->priv->web_viewer), + U1_CONNECTING_PAGE, NULL); + /* Rescan for things later */ g_timeout_add_seconds(10, (GSourceFunc) _u1_music_store_delayed_init, 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); + music_store->priv->idle_cb = g_timeout_add_seconds (2, (GSourceFunc) load_real_store_cb, music_store); } @@ -1416,15 +1414,15 @@ g_return_if_fail (U1_IS_MUSIC_STORE (music_store)); g_return_if_fail (url != NULL); - /* Stop any currently pending or active page loads first */ - webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (music_store->priv->web_viewer)); - /* If the load_real_store callback is set up, disable it first */ if (music_store->priv->idle_cb > 0) { g_source_remove (music_store->priv->idle_cb); music_store->priv->idle_cb = 0; } + /* Stop any currently pending or active page loads first */ + webkit_web_view_stop_loading (WEBKIT_WEB_VIEW (music_store->priv->web_viewer)); + quoted_url = g_uri_escape_string (url, NULL, FALSE); real_url = g_strdup_printf ("%s%s?forward_on_to_url=%s", music_store->priv->base_url,