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

[dobey]

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'config.h.in'
--- config.h.in	2010-02-16 20:56:56 +0000
+++ config.h.in	2011-03-10 01:23:54 +0000
@@ -1,8 +1,5 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
-/* Define to enable OAuth debugging */
-#undef DEBUG_OAUTH
-
 /* always defined to indicate that i18n is enabled */
 #undef ENABLE_NLS
 
 
=== modified file 'configure'
--- configure	2011-02-16 17:25:49 +0000
+++ configure	2011-03-10 01:23:54 +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.3.11.
+# Generated by GNU Autoconf 2.67 for libubuntuone 0.9.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.3.11'
-PACKAGE_STRING='libubuntuone 0.3.11'
+PACKAGE_VERSION='0.9.0'
+PACKAGE_STRING='libubuntuone 0.9.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.3.11 to adapt to many kinds of systems.
+\`configure' configures libubuntuone 0.9.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.3.11:";;
+     short | recursive ) echo "Configuration of libubuntuone 0.9.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.3.11
+libubuntuone configure 0.9.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.3.11, which was
+It was created by libubuntuone $as_me 0.9.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.3.11'
+ VERSION='0.9.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -12926,9 +12926,6 @@
 
 $as_echo "#define HAVE_OAUTH 1" >>confdefs.h
 
-
-$as_echo "#define DEBUG_OAUTH 1" >>confdefs.h
-
    have_oauth="yes"
    OAUTH_LIBS="-lm -lcrypto"
 
@@ -14641,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.3.11, which was
+This file was extended by libubuntuone $as_me 0.9.0, which was
 generated by GNU Autoconf 2.67.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14707,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.3.11
+libubuntuone config.status 0.9.0
 configured by $0, generated by GNU Autoconf 2.67,
   with options \\"\$ac_cs_config\\"
 
 
=== modified file 'configure.ac'
--- configure.ac	2011-02-16 17:24:08 +0000
+++ configure.ac	2011-03-10 01:23:54 +0000
@@ -1,4 +1,4 @@
-AC_INIT([libubuntuone], [0.3.11], [], [libubuntuone])
+AC_INIT([libubuntuone], [0.9.0], [], [libubuntuone])
 
 AC_PREREQ([2.59])
 
@@ -68,7 +68,6 @@
 AC_CHECK_LIB(crypto, CRYPTO_free, have_oauth_libs="yes", have_oauth_libs="no")
 if test "x$have_oauth_headers" = "xyes" -a "x$have_oauth_libs" = "xyes"; then
    AC_DEFINE(HAVE_OAUTH, 1, [Define to build OAUTH signing code])
-   AC_DEFINE(DEBUG_OAUTH, 1, [Define to enable OAuth debugging])
    have_oauth="yes"
    OAUTH_LIBS="-lm -lcrypto"
    AC_SUBST(OAUTH_LIBS)
 
=== modified file 'data/img/logo.png'
 Binary files data/img/logo.png	2010-04-01 17:42:58 +0000 and data/img/logo.png	2011-03-10 01:23:54 +0000 differ
=== modified file 'debian/changelog'
--- debian/changelog	2011-02-16 17:25:49 +0000
+++ debian/changelog	2011-03-10 01:23:54 +0000
@@ -1,3 +1,10 @@
+libubuntuone (0.9.0-0ubuntu1) natty; urgency=low
+
+  * New upstream release.
+    - Don't log oauth information to console (LP: #723297)
+
+ -- Rodney Dawes <[e-mail]>  Wed, 09 Mar 2011 20:13:12 -0500
+
 libubuntuone (0.3.11-0ubuntu1) natty; urgency=low
 
   * New upstream release.
 
=== modified file 'libubuntuone/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-01-14 22:24:48 +0000
+++ libubuntuone/u1-music-store.c	2011-03-10 01:23:54 +0000
@@ -256,19 +256,9 @@
 get_url_to_use (U1MusicStore *music_store)
 {
 	gchar *oauth_consumer_token, *oauth_consumer_secret, *oauth_token = NULL, *oauth_token_secret = NULL, *real_url;
-	const gchar *url_to_use;
-
-	/* 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";
-
-	if (music_store->priv->base_url != NULL)
-		g_free (music_store->priv->base_url);
-
-	music_store->priv->base_url = g_strdup (url_to_use);
 
 	/* OAUth sign the URL */
-	if (g_str_has_prefix (url_to_use, "http://localhost") || g_str_has_prefix (url_to_use, "http://127.0.0.1")) {
+	if (g_str_has_prefix (music_store->priv->base_url, "http://localhost") || g_str_has_prefix (music_store->priv->base_url, "http://127.0.0.1")) {
 		const gchar *oauthfile;
 
 		oauthfile = g_getenv ("OAUTHKEYFILE");
@@ -519,8 +509,6 @@
 	SoupURI *parsed_uri;
 	gchar *internal_uri;
 
-	g_debug ("navigation requested to %s", webkit_network_request_get_uri (request));
-
 	/* Remove watching callback for the page */
 	if (music_store->priv->watch_id != 0) {
 		g_source_remove (music_store->priv->watch_id);
@@ -959,6 +947,7 @@
 u1_music_store_init (U1MusicStore *music_store)
 {
 	gchar *new_user_agent;
+	const gchar *url_to_use;
 	GError *error = NULL;
 
 	if (!g_thread_get_initialized ())
@@ -968,6 +957,12 @@
 	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 ();
 
+	/* 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) {
@@ -1098,6 +1093,12 @@
 	g_return_if_fail (U1_IS_MUSIC_STORE (music_store));
 	g_return_if_fail (url != NULL);
 
+	/* 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;
+	}
+
 	real_url = g_strdup_printf ("%s%s?forward_on_to_url=%s",
 				    music_store->priv->base_url,
 				    U1_STORE_URL,
 
=== modified file 'ltmain.sh'
--- ltmain.sh	2010-03-08 16:07:58 +0000
+++ ltmain.sh	2011-03-10 01:23:54 +0000
@@ -65,7 +65,7 @@
 #       compiler:		$LTCC
 #       compiler flags:		$LTCFLAGS
 #       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu1
+#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2ubuntu3
 #       automake:		$automake_version
 #       autoconf:		$autoconf_version
 #
@@ -73,7 +73,7 @@
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2ubuntu1"
+VERSION="2.2.6b Debian-2.2.6b-2ubuntu3"
 TIMESTAMP=""
 package_revision=1.3017