libubuntuone

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

  1. split-ui-lib
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 150
Merged at revision: 146
Proposed branch: lp:~dobey/libubuntuone/split-ui-lib
Merge into: lp:libubuntuone
Diff against target: 312 lines (+57/-71)
11 files modified
.bzrignore (+1/-2)
Makefile.am (+4/-7)
configure.ac (+13/-19)
libubuntuoneui.pc.in (+4/-4)
libubuntuoneui/Makefile.am (+13/-13)
libubuntuoneui/u1-codec-installer.c (+12/-6)
libubuntuoneui/u1-music-store.c (+3/-1)
po/POTFILES.in (+3/-3)
tests/Makefile.am (+3/-3)
tests/test-music-store.c (+1/-1)
ubuntuone-sharp.pc.in (+0/-12)
To merge this branch: bzr merge lp:~dobey/libubuntuone/split-ui-lib
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+90529@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
Natalia Bidart (nataliabidart) wrote :

Looks good! Can I test this IRL somehow?

Revision history for this message
dobey (dobey) wrote :

> 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.

Revision history for this message
Manuel de la Peña (mandel) wrote :

Looks good.

review: Approve
Revision history for this message
Roberto Alsina (ralsina) wrote :

+1

review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (7.3 KiB)

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...

Read more...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file '.bzrignore'
--- .bzrignore 2011-02-09 20:58:13 +0000
+++ .bzrignore 2012-01-27 22:37:25 +0000
@@ -40,7 +40,6 @@
40bindings/mono/*.cs40bindings/mono/*.cs
41bindings/mono/ubuntuone.sources41bindings/mono/ubuntuone.sources
42bindings/mono/ubuntuone-api.xml42bindings/mono/ubuntuone-api.xml
43bindings/python/ubuntuone.c43*/u1-marshal.[ch]
44libubuntuone/u1-marshal.[ch]
4544
46test-music-store45test-music-store
4746
=== 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 @@
1SUBDIRS = data libubuntuone tests po1SUBDIRS = data libubuntuone libubuntuoneui tests po
22
3EXTRA_DIST = COPYING.GPL3EXTRA_DIST = COPYING.GPL
44
5pcfiles = libubuntuone-1.0.pc5pcfiles = libubuntuoneui-3.0.pc
66
7libubuntuone-1.0.pc: libubuntuone.pc7libubuntuoneui-3.0.pc: libubuntuoneui.pc
8 @cp -f $< $@
9
10ubuntuone-sharp-1.0.pc: ubuntuone-sharp.pc
11 @cp -f $< $@8 @cp -f $< $@
129
13pkgconfig_DATA = $(pcfiles)10pkgconfig_DATA = $(pcfiles)
1411
=== 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 @@
18AC_PROG_LIBTOOL18AC_PROG_LIBTOOL
1919
20dnl i18n20dnl i18n
21IT_PROG_INTLTOOL([0.35.5])21IT_PROG_INTLTOOL([0.41.0])
22AM_GLIB_GNU_GETTEXT22AM_GLIB_GNU_GETTEXT
2323
24GETTEXT_PACKAGE=libubuntuone24GETTEXT_PACKAGE=libubuntuone
@@ -32,16 +32,16 @@
32AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)32AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
3333
34dnl Look for needed modules34dnl Look for needed modules
35PKG_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)35PKG_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)
36AC_SUBST(LIBUBUNTUONE_CFLAGS)36AC_SUBST(LIBUBUNTUONEUI_CFLAGS)
37AC_SUBST(LIBUBUNTUONE_LIBS)37AC_SUBST(LIBUBUNTUONEUI_LIBS)
3838
39LIBUBUNTUONE_CURRENT=139LIBUBUNTUONEUI_CURRENT=1
40LIBUBUNTUONE_REVISION=040LIBUBUNTUONEUI_REVISION=0
41LIBUBUNTUONE_AGE=041LIBUBUNTUONEUI_AGE=0
42AC_SUBST(LIBUBUNTUONE_CURRENT)42AC_SUBST(LIBUBUNTUONEUI_CURRENT)
43AC_SUBST(LIBUBUNTUONE_REVISION)43AC_SUBST(LIBUBUNTUONEUI_REVISION)
44AC_SUBST(LIBUBUNTUONE_AGE)44AC_SUBST(LIBUBUNTUONEUI_AGE)
4545
46AC_MSG_CHECKING([development series build])46AC_MSG_CHECKING([development series build])
47DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"47DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
@@ -75,13 +75,6 @@
75 AC_MSG_ERROR(You need openssl to build OAuth support)75 AC_MSG_ERROR(You need openssl to build OAuth support)
76fi76fi
7777
78LIBUBUNTUONE_CURRENT=1
79LIBUBUNTUONE_REVISION=0
80LIBUBUNTUONE_AGE=0
81AC_SUBST(LIBUBUNTUONE_CURRENT)
82AC_SUBST(LIBUBUNTUONE_REVISION)
83AC_SUBST(LIBUBUNTUONE_AGE)
84
85##################################################78##################################################
86# Check for gtk-doc.79# Check for gtk-doc.
87##################################################80##################################################
@@ -90,7 +83,7 @@
90AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)83AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
9184
92dnl JavaScript scripts location85dnl JavaScript scripts location
93U1_JAVASCRIPT_DIR=$datadir/libubuntuone/$LIBUBUNTUONE_CURRENT/javascript86U1_JAVASCRIPT_DIR=$datadir/libubuntuoneui/$LIBUBUNTUONEUI_CURRENT/javascript
94AC_SUBST(U1_JAVASCRIPT_DIR)87AC_SUBST(U1_JAVASCRIPT_DIR)
9588
96##################################################89##################################################
@@ -110,8 +103,9 @@
110AC_CONFIG_FILES([103AC_CONFIG_FILES([
111Makefile104Makefile
112data/Makefile105data/Makefile
113libubuntuone.pc
114libubuntuone/Makefile106libubuntuone/Makefile
107libubuntuoneui.pc
108libubuntuoneui/Makefile
115tests/Makefile109tests/Makefile
116po/Makefile.in110po/Makefile.in
117])111])
118112
=== 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 @@
3libdir=${exec_prefix}/lib3libdir=${exec_prefix}/lib
4includedir=${exec_prefix}/include4includedir=${exec_prefix}/include
55
6Name: libubuntuone6Name: libubuntuoneui
7Description: Widget library for Ubuntu One integration in applications7Description: Widget library for Ubuntu One integration in applications
8Version: @VERSION@8Version: @VERSION@
9Libs: -L${libdir} -lubuntuone-1.09Libs: -L${libdir} -lubuntuoneui-3.0
10Cflags: -I${includedir}/libubuntuone-1.010Cflags: -I${includedir}/libubuntuoneui-3.0
11Requires: webkit-1.011Requires: webkitgtk-3.0
1212
=== 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 @@
1CLEANFILES = $(MARSHAL_GENERATED)1CLEANFILES = $(MARSHAL_GENERATED)
22
3INCLUDES = \3INCLUDES = \
4 $(LIBUBUNTUONE_CFLAGS) \4 $(LIBUBUNTUONEUI_CFLAGS) \
5 -DU1_JAVASCRIPT_DIR=\"$(U1_JAVASCRIPT_DIR)\"5 -DU1_JAVASCRIPT_DIR=\"$(U1_JAVASCRIPT_DIR)\"
66
7lib_LTLIBRARIES = libubuntuone-1.0.la7lib_LTLIBRARIES = libubuntuoneui-3.0.la
88
9# Marshallers9# Marshallers
10MARSHAL_GENERATED = u1-marshal.c u1-marshal.h10MARSHAL_GENERATED = u1-marshal.c u1-marshal.h
@@ -15,7 +15,7 @@
15u1-marshal.c: u1-marshal.list $(GLIB_GENMARSHAL) u1-marshal.h15u1-marshal.c: u1-marshal.list $(GLIB_GENMARSHAL) u1-marshal.h
16 $(GLIB_GENMARSHAL) $< --body --prefix=_u1_marshal > $@16 $(GLIB_GENMARSHAL) $< --body --prefix=_u1_marshal > $@
1717
18libubuntuone_1_0_la_SOURCES = \18libubuntuoneui_3_0_la_SOURCES = \
19 $(MARSHAL_GENERATED) \19 $(MARSHAL_GENERATED) \
20 oauth.c \20 oauth.c \
21 oauth.h \21 oauth.h \
@@ -26,12 +26,12 @@
26 u1-request-chrome.h \26 u1-request-chrome.h \
27 xmalloc.c \27 xmalloc.c \
28 xmalloc.h28 xmalloc.h
29libubuntuone_1_0_la_LDFLAGS = -version-info $(LIBUBUNTUONE_CURRENT):$(LIBUBUNTUONE_REVISION):$(LIBUBUNTUONE_AGE)29libubuntuoneui_3_0_la_LDFLAGS = -version-info $(LIBUBUNTUONEUI_CURRENT):$(LIBUBUNTUONEUI_REVISION):$(LIBUBUNTUONEUI_AGE)
30libubuntuone_1_0_la_LIBADD = \30libubuntuoneui_3_0_la_LIBADD = \
31 $(LIBUBUNTUONE_LIBS) \31 $(LIBUBUNTUONEUI_LIBS) \
32 $(OAUTH_LIBS)32 $(OAUTH_LIBS)
3333
34u1includedir = $(includedir)/libubuntuone-1.034u1includedir = $(includedir)/libubuntuoneui-3.0
35u1include_HEADERS = \35u1include_HEADERS = \
36 u1-music-store.h36 u1-music-store.h
3737
@@ -50,12 +50,12 @@
50introspection_files = \50introspection_files = \
51 $(u1include_HEADERS) \51 $(u1include_HEADERS) \
52 u1-music-store.c52 u1-music-store.c
53UbuntuOne-1.0.gir: libubuntuone-1.0.la Makefile53UbuntuOneUI-3.0.gir: libubuntuoneui-3.0.la Makefile
54UbuntuOne_1_0_gir_INCLUDES = Gtk-2.0 GLib-2.054UbuntuOneUI_3_0_gir_INCLUDES = Gtk-3.0 GLib-2.0
55UbuntuOne_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)55UbuntuOneUI_3_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
56UbuntuOne_1_0_gir_LIBS = libubuntuone-1.0.la56UbuntuOneUI_3_0_gir_LIBS = libubuntuoneui-3.0.la
57UbuntuOne_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))57UbuntuOneUI_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
58INTROSPECTION_GIRS += UbuntuOne-1.0.gir58INTROSPECTION_GIRS += UbuntuOneUI-3.0.gir
5959
60girdir = $(datadir)/gir-1.0/60girdir = $(datadir)/gir-1.0/
61gir_DATA = $(INTROSPECTION_GIRS)61gir_DATA = $(INTROSPECTION_GIRS)
6262
=== 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 @@
230 if (g_strcmp0 (property, "ProgressDetails") == 0) {230 if (g_strcmp0 (property, "ProgressDetails") == 0) {
231 gint transaction, items_done, items_total;231 gint transaction, items_done, items_total;
232 gint bytes_done, bytes_total, speed;232 gint bytes_done, bytes_total, speed;
233 g_variant_get (value, "(iiiiii)", &transaction,233 if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(iixxdx)")))
234 &items_done, &items_total,234 g_variant_get (value, "(iixxdx)", &transaction,
235 &bytes_done, &bytes_total,235 &items_done, &items_total,
236 &speed);236 &bytes_done, &bytes_total,
237 &speed);
238 else
239 g_variant_get (value, "(iiiiii)", &transaction,
240 &items_done, &items_total,
241 &bytes_done, &bytes_total,
242 &speed);
237243
238 if (items_total == 0 && bytes_total == 0)244 if (items_total == 0 && bytes_total == 0)
239 gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), "");245 gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), "");
@@ -246,10 +252,10 @@
246 if (speed != 0) {252 if (speed != 0) {
247 gchar *ks = g_format_size (speed);253 gchar *ks = g_format_size (speed);
248254
249 message = g_strdup_printf (_("Downloaded %sB of %sB at %sB/s"), bd, bt, ks);255 message = g_strdup_printf (_("Downloaded %s of %s at %s/s"), bd, bt, ks);
250 g_free (ks);256 g_free (ks);
251 } else257 } else
252 message = g_strdup_printf (_("Downloaded %sB of %sB"), bd, bt);258 message = g_strdup_printf (_("Downloaded %s of %s"), bd, bt);
253259
254 gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), message);260 gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), message);
255261
256262
=== 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 @@
527 U1MusicStore *music_store = U1_MUSIC_STORE (user_data);527 U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
528 SoupURI *parsed_uri;528 SoupURI *parsed_uri;
529 gchar *internal_uri;529 gchar *internal_uri;
530 const gchar *network_uri;
530 gboolean return_val = FALSE;531 gboolean return_val = FALSE;
531532
532 /* Hide the alertbar in case we should show something else */533 /* Hide the alertbar in case we should show something else */
@@ -548,7 +549,8 @@
548 if (parsed_uri == NULL)549 if (parsed_uri == NULL)
549 return FALSE;550 return FALSE;
550551
551 if (g_str_has_prefix (webkit_network_request_get_uri (request), U1_NOT_REGISTERED_URL)) {552 network_uri = webkit_network_request_get_uri (request);
553 if (network_uri != NULL && g_str_has_prefix (network_uri, U1_NOT_REGISTERED_URL)) {
552 fire_authentication (music_store, request, policy_decision);554 fire_authentication (music_store, request, policy_decision);
553 } else if (g_str_has_prefix (parsed_uri->path, "/auth/login") &&555 } else if (g_str_has_prefix (parsed_uri->path, "/auth/login") &&
554 g_strrstr (parsed_uri->query, "next=") != NULL) {556 g_strrstr (parsed_uri->query, "next=") != NULL) {
555557
=== 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 @@
1libubuntuone/u1-codec-installer.c1libubuntuoneui/u1-codec-installer.c
2libubuntuone/u1-music-store.c2libubuntuoneui/u1-music-store.c
3libubuntuone/xmalloc.c3libubuntuoneui/xmalloc.c
44
=== 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 @@
1INCLUDES = \1INCLUDES = \
2 $(LIBUBUNTUONE_CFLAGS) \2 $(LIBUBUNTUONEUI_CFLAGS) \
3 -I$(top_srcdir)3 -I$(top_srcdir)
44
5noinst_PROGRAMS = \5noinst_PROGRAMS = \
@@ -7,7 +7,7 @@
77
8test_music_store_SOURCES = test-music-store.c8test_music_store_SOURCES = test-music-store.c
9test_music_store_LDADD = \9test_music_store_LDADD = \
10 $(LIBUBUNTUONE_LIBS) \10 $(LIBUBUNTUONEUI_LIBS) \
11 $(top_builddir)/libubuntuone/libubuntuone-1.0.la11 $(top_builddir)/libubuntuoneui/libubuntuoneui-3.0.la
1212
13MAINTAINERCLEANFILES = Makefile.in13MAINTAINERCLEANFILES = Makefile.in
1414
=== 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 @@
19 * Boston, MA 02110-1301, USA.19 * Boston, MA 02110-1301, USA.
20 */20 */
2121
22#include <libubuntuone/u1-music-store.h>22#include <libubuntuoneui/u1-music-store.h>
2323
24static void24static void
25preview_mp3_cb (U1MusicStore *music_store, const gchar *url, const gchar *title, gpointer user_data)25preview_mp3_cb (U1MusicStore *music_store, const gchar *url, const gchar *title, gpointer user_data)
2626
=== 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 @@
1prefix=${pcfiledir}/../..
2exec_prefix=${prefix}
3libdir=${exec_prefix}/lib
4assemblies_dir=${libdir}/mono/ubuntuone-sharp-1.0
5Libraries=${assemblies_dir}/ubuntuone-sharp.dll
6
7
8Name: UbuntuOne#
9Description: UbuntuOne# - Ubuntu One .NET Binding
10Version: @VERSION@
11Libs: -r:${Libraries}
12

Subscribers

People subscribed via source and target branches