Merge lp:~dobey/libubuntuone/split-ui-lib into lp:libubuntuone

[dobey]

Switch to webkitgtk-3.0
Move the current libubuntuone to libubuntuoneui
Update all the current references to libubuntuone to be libubuntuoneui
Add back a libubuntuone directory for coming code
Change the API version to 3.0 to break compat

[Natalia Bidart (nataliabidart)]

Looks good! Can I test this IRL somehow?

[dobey (dobey)]

> Looks good! Can I test this IRL somehow?

./autogen.sh && make U1_JAVASCRIPT_DIR=`pwd`/data && ./tests/test-music-store

Beyond that, not really, as nothing else is fixed to use it yet. Though rhythmbox-ubuntuone will be soon.

[Manuel de la Peña (mandel)]

Looks good.

review: Approve

[Roberto Alsina (ralsina)]

+1

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~dobey/libubuntuone/split-ui-lib into lp:libubuntuone failed. Below is the output from the failed tests.

/usr/bin/gnome-autogen.sh
checking for autoconf >= 2.53...
  testing autoconf2.50... not found.
  testing autoconf... found 2.67
checking for automake >= 1.6...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
checking for glib-gettext >= 2.2.0...
  testing glib-gettextize... found 2.28.6
checking for intltool >= 0.30...
  testing intltoolize... found 0.41.1
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.25
checking for gtk-doc >= 1.0...
  testing gtkdocize... found 1.17
Checking for required M4 macros...
Checking for forbidden M4 macros...
Processing ./configure.ac
Running libtoolize...
libtoolize: putting auxiliary files in `.'.
libtoolize: copying file `./ltmain.sh'
libtoolize: You should add the contents of the following files to `aclocal.m4':
libtoolize: `/usr/share/aclocal/libtool.m4'
libtoolize: `/usr/share/aclocal/ltoptions.m4'
libtoolize: `/usr/share/aclocal/ltversion.m4'
libtoolize: `/usr/share/aclocal/ltsugar.m4'
libtoolize: `/usr/share/aclocal/lt~obsolete.m4'
libtoolize: Consider adding `AC_CONFIG_MACRO_DIR([m4])' to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding `-I m4' to ACLOCAL_AMFLAGS in Makefile.am.
Running glib-gettextize... Ignore non-fatal messages.
Copying file mkinstalldirs
Copying file po/Makefile.in.in

Please add the files
  codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4
  progtest.m4
from the /aclocal directory to your autoconf macro directory
or directly to your aclocal.m4 file.
You will also need config.guess and config.sub, which you can get from
ftp://ftp.gnu.org/pub/gnu/config/.

Running intltoolize...
Running gtkdocize...
Running aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --enable-gtk-doc --enable-debug ...
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking for style of include used by make... GNU
checking for gcc... gcc
checking whether the C compiler works... yes
checking for C compiler default output file name... a.out
checking for suffix of executables...
checking whether we are cross compiling... no
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking how to run the C preprocessor... gcc -E
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
check...

=== modified file '.bzrignore'
--- .bzrignore	2011-02-09 20:58:13 +0000
+++ .bzrignore	2012-01-27 22:37:25 +0000
@@ -40,7 +40,6 @@
 bindings/mono/*.cs
 bindings/mono/ubuntuone.sources
 bindings/mono/ubuntuone-api.xml
-bindings/python/ubuntuone.c
-libubuntuone/u1-marshal.[ch]
+*/u1-marshal.[ch]
 
 test-music-store

=== modified file 'Makefile.am'
--- Makefile.am	2012-01-12 18:09:00 +0000
+++ Makefile.am	2012-01-27 22:37:25 +0000
@@ -1,13 +1,10 @@
-SUBDIRS = data libubuntuone tests po
+SUBDIRS = data libubuntuone libubuntuoneui tests po
 
 EXTRA_DIST = COPYING.GPL
 
-pcfiles = libubuntuone-1.0.pc
-
-libubuntuone-1.0.pc: libubuntuone.pc
-	@cp -f $< $@
-
-ubuntuone-sharp-1.0.pc: ubuntuone-sharp.pc
+pcfiles = libubuntuoneui-3.0.pc
+
+libubuntuoneui-3.0.pc: libubuntuoneui.pc
 	@cp -f $< $@
 
 pkgconfig_DATA = $(pcfiles)

=== modified file 'configure.ac'
--- configure.ac	2012-01-12 18:09:00 +0000
+++ configure.ac	2012-01-27 22:37:25 +0000
@@ -18,7 +18,7 @@
 AC_PROG_LIBTOOL
 
 dnl i18n
-IT_PROG_INTLTOOL([0.35.5])
+IT_PROG_INTLTOOL([0.41.0])
 AM_GLIB_GNU_GETTEXT
 
 GETTEXT_PACKAGE=libubuntuone
@@ -32,16 +32,16 @@
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 dnl Look for needed modules
-PKG_CHECK_MODULES(LIBUBUNTUONE, glib-2.0 >= 2.24 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 gstreamer-0.10 gstreamer-pbutils-0.10)
-AC_SUBST(LIBUBUNTUONE_CFLAGS)
-AC_SUBST(LIBUBUNTUONE_LIBS)
+PKG_CHECK_MODULES(LIBUBUNTUONEUI, glib-2.0 >= 2.24 gdk-pixbuf-2.0 webkitgtk-3.0 >= 1.1.15 libxml-2.0 libsoup-2.4 >= 2.33.1 libsoup-gnome-2.4 libsyncdaemon-1.0 >= 1.4.2 gstreamer-0.10 gstreamer-pbutils-0.10)
+AC_SUBST(LIBUBUNTUONEUI_CFLAGS)
+AC_SUBST(LIBUBUNTUONEUI_LIBS)
 
-LIBUBUNTUONE_CURRENT=1
-LIBUBUNTUONE_REVISION=0
-LIBUBUNTUONE_AGE=0
-AC_SUBST(LIBUBUNTUONE_CURRENT)
-AC_SUBST(LIBUBUNTUONE_REVISION)
-AC_SUBST(LIBUBUNTUONE_AGE)
+LIBUBUNTUONEUI_CURRENT=1
+LIBUBUNTUONEUI_REVISION=0
+LIBUBUNTUONEUI_AGE=0
+AC_SUBST(LIBUBUNTUONEUI_CURRENT)
+AC_SUBST(LIBUBUNTUONEUI_REVISION)
+AC_SUBST(LIBUBUNTUONEUI_AGE)
 
 AC_MSG_CHECKING([development series build])
 DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
@@ -75,13 +75,6 @@
    AC_MSG_ERROR(You need openssl to build OAuth support)
 fi
 
-LIBUBUNTUONE_CURRENT=1
-LIBUBUNTUONE_REVISION=0
-LIBUBUNTUONE_AGE=0
-AC_SUBST(LIBUBUNTUONE_CURRENT)
-AC_SUBST(LIBUBUNTUONE_REVISION)
-AC_SUBST(LIBUBUNTUONE_AGE)
-
 ##################################################
 # Check for gtk-doc.
 ##################################################
@@ -90,7 +83,7 @@
 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
 
 dnl JavaScript scripts location
-U1_JAVASCRIPT_DIR=$datadir/libubuntuone/$LIBUBUNTUONE_CURRENT/javascript
+U1_JAVASCRIPT_DIR=$datadir/libubuntuoneui/$LIBUBUNTUONEUI_CURRENT/javascript
 AC_SUBST(U1_JAVASCRIPT_DIR)
 
 ##################################################
@@ -110,8 +103,9 @@
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
-libubuntuone.pc
 libubuntuone/Makefile
+libubuntuoneui.pc
+libubuntuoneui/Makefile
 tests/Makefile
 po/Makefile.in
 ])

=== added directory 'libubuntuone'
=== added file 'libubuntuone/Makefile.am'
=== renamed directory 'libubuntuone' => 'libubuntuoneui'
=== renamed file 'libubuntuone.pc.in' => 'libubuntuoneui.pc.in'
--- libubuntuone.pc.in	2009-11-23 18:07:47 +0000
+++ libubuntuoneui.pc.in	2012-01-27 22:37:25 +0000
@@ -3,9 +3,9 @@
 libdir=${exec_prefix}/lib
 includedir=${exec_prefix}/include
 
-Name: libubuntuone
+Name: libubuntuoneui
 Description: Widget library for Ubuntu One integration in applications
 Version: @VERSION@
-Libs: -L${libdir} -lubuntuone-1.0
-Cflags: -I${includedir}/libubuntuone-1.0
-Requires: webkit-1.0
+Libs: -L${libdir} -lubuntuoneui-3.0
+Cflags: -I${includedir}/libubuntuoneui-3.0
+Requires: webkitgtk-3.0

=== modified file 'libubuntuoneui/Makefile.am'
--- libubuntuone/Makefile.am	2011-04-01 17:19:03 +0000
+++ libubuntuoneui/Makefile.am	2012-01-27 22:37:25 +0000
@@ -1,10 +1,10 @@
 CLEANFILES = $(MARSHAL_GENERATED)
 
 INCLUDES =						\
-	$(LIBUBUNTUONE_CFLAGS)				\
+	$(LIBUBUNTUONEUI_CFLAGS)				\
 	-DU1_JAVASCRIPT_DIR=\"$(U1_JAVASCRIPT_DIR)\"
 
-lib_LTLIBRARIES = libubuntuone-1.0.la
+lib_LTLIBRARIES = libubuntuoneui-3.0.la
 
 # Marshallers
 MARSHAL_GENERATED = u1-marshal.c u1-marshal.h
@@ -15,7 +15,7 @@
 u1-marshal.c: u1-marshal.list $(GLIB_GENMARSHAL) u1-marshal.h
 	$(GLIB_GENMARSHAL) $< --body --prefix=_u1_marshal > $@
 
-libubuntuone_1_0_la_SOURCES =	\
+libubuntuoneui_3_0_la_SOURCES =	\
 	$(MARSHAL_GENERATED)	\
 	oauth.c			\
 	oauth.h			\
@@ -26,12 +26,12 @@
 	u1-request-chrome.h	\
 	xmalloc.c		\
 	xmalloc.h
-libubuntuone_1_0_la_LDFLAGS = -version-info $(LIBUBUNTUONE_CURRENT):$(LIBUBUNTUONE_REVISION):$(LIBUBUNTUONE_AGE)
-libubuntuone_1_0_la_LIBADD = 	\
-	$(LIBUBUNTUONE_LIBS)	\
+libubuntuoneui_3_0_la_LDFLAGS = -version-info $(LIBUBUNTUONEUI_CURRENT):$(LIBUBUNTUONEUI_REVISION):$(LIBUBUNTUONEUI_AGE)
+libubuntuoneui_3_0_la_LIBADD = 	\
+	$(LIBUBUNTUONEUI_LIBS)	\
 	$(OAUTH_LIBS)
 
-u1includedir = $(includedir)/libubuntuone-1.0
+u1includedir = $(includedir)/libubuntuoneui-3.0
 u1include_HEADERS =		\
 	u1-music-store.h
 
@@ -50,12 +50,12 @@
 introspection_files =			\
         $(u1include_HEADERS)		\
         u1-music-store.c
-UbuntuOne-1.0.gir: libubuntuone-1.0.la Makefile
-UbuntuOne_1_0_gir_INCLUDES = Gtk-2.0 GLib-2.0
-UbuntuOne_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
-UbuntuOne_1_0_gir_LIBS = libubuntuone-1.0.la
-UbuntuOne_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
-INTROSPECTION_GIRS += UbuntuOne-1.0.gir
+UbuntuOneUI-3.0.gir: libubuntuoneui-3.0.la Makefile
+UbuntuOneUI_3_0_gir_INCLUDES = Gtk-3.0 GLib-2.0
+UbuntuOneUI_3_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
+UbuntuOneUI_3_0_gir_LIBS = libubuntuoneui-3.0.la
+UbuntuOneUI_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
+INTROSPECTION_GIRS += UbuntuOneUI-3.0.gir
 
 girdir = $(datadir)/gir-1.0/
 gir_DATA = $(INTROSPECTION_GIRS)

=== modified file 'libubuntuoneui/u1-codec-installer.c'
--- libubuntuone/u1-codec-installer.c	2011-12-20 09:12:56 +0000
+++ libubuntuoneui/u1-codec-installer.c	2012-01-27 22:37:25 +0000
@@ -230,10 +230,16 @@
 	if (g_strcmp0 (property, "ProgressDetails") == 0) {
 		gint transaction, items_done, items_total;
 		gint bytes_done, bytes_total, speed;
-		g_variant_get (value, "(iiiiii)", &transaction,
-			       &items_done, &items_total,
-			       &bytes_done, &bytes_total,
-			       &speed);
+		if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(iixxdx)")))
+			g_variant_get (value, "(iixxdx)", &transaction,
+				       &items_done, &items_total,
+				       &bytes_done, &bytes_total,
+				       &speed);
+		else
+			g_variant_get (value, "(iiiiii)", &transaction,
+				       &items_done, &items_total,
+				       &bytes_done, &bytes_total,
+				       &speed);
 
 		if (items_total == 0 && bytes_total == 0)
 			gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), "");
@@ -246,10 +252,10 @@
 			if (speed != 0) {
 				gchar *ks = g_format_size (speed);
 
-				message = g_strdup_printf (_("Downloaded %sB of %sB at %sB/s"), bd, bt, ks);
+				message = g_strdup_printf (_("Downloaded %s of %s at %s/s"), bd, bt, ks);
 				g_free (ks);
 			} else
-				message = g_strdup_printf (_("Downloaded %sB of %sB"), bd, bt);
+				message = g_strdup_printf (_("Downloaded %s of %s"), bd, bt);
 
 			gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), message);
 

=== modified file 'libubuntuoneui/u1-music-store.c'
--- libubuntuone/u1-music-store.c	2011-12-20 23:11:04 +0000
+++ libubuntuoneui/u1-music-store.c	2012-01-27 22:37:25 +0000
@@ -527,6 +527,7 @@
 	U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
 	SoupURI *parsed_uri;
 	gchar *internal_uri;
+	const gchar *network_uri;
 	gboolean return_val = FALSE;
 
 	/* Hide the alertbar in case we should show something else */
@@ -548,7 +549,8 @@
 	if (parsed_uri == NULL)
 		return FALSE;
 
-	if (g_str_has_prefix (webkit_network_request_get_uri (request), U1_NOT_REGISTERED_URL)) {
+	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") &&
 		   g_strrstr (parsed_uri->query, "next=") != NULL) {

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2011-04-07 14:11:59 +0000
+++ po/POTFILES.in	2012-01-27 22:37:25 +0000
@@ -1,3 +1,3 @@
-libubuntuone/u1-codec-installer.c
-libubuntuone/u1-music-store.c
-libubuntuone/xmalloc.c
+libubuntuoneui/u1-codec-installer.c
+libubuntuoneui/u1-music-store.c
+libubuntuoneui/xmalloc.c

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2010-08-25 18:35:07 +0000
+++ tests/Makefile.am	2012-01-27 22:37:25 +0000
@@ -1,5 +1,5 @@
 INCLUDES =			\
-	$(LIBUBUNTUONE_CFLAGS)	\
+	$(LIBUBUNTUONEUI_CFLAGS)	\
 	-I$(top_srcdir)
 
 noinst_PROGRAMS =		\
@@ -7,7 +7,7 @@
 
 test_music_store_SOURCES = test-music-store.c
 test_music_store_LDADD = 				\
-	$(LIBUBUNTUONE_LIBS)				\
-	$(top_builddir)/libubuntuone/libubuntuone-1.0.la
+	$(LIBUBUNTUONEUI_LIBS)				\
+	$(top_builddir)/libubuntuoneui/libubuntuoneui-3.0.la
 
 MAINTAINERCLEANFILES = Makefile.in

=== modified file 'tests/test-music-store.c'
--- tests/test-music-store.c	2011-12-18 10:23:12 +0000
+++ tests/test-music-store.c	2012-01-27 22:37:25 +0000
@@ -19,7 +19,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#include <libubuntuone/u1-music-store.h>
+#include <libubuntuoneui/u1-music-store.h>
 
 static void
 preview_mp3_cb (U1MusicStore *music_store, const gchar *url, const gchar *title, gpointer user_data)

=== removed file 'ubuntuone-sharp.pc.in'
--- ubuntuone-sharp.pc.in	2010-03-08 15:38:36 +0000
+++ ubuntuone-sharp.pc.in	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-prefix=${pcfiledir}/../..
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-assemblies_dir=${libdir}/mono/ubuntuone-sharp-1.0
-Libraries=${assemblies_dir}/ubuntuone-sharp.dll
-
-
-Name: UbuntuOne#
-Description: UbuntuOne# - Ubuntu One .NET Binding
-Version: @VERSION@
-Libs: -r:${Libraries}
-