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

Proposed by dobey on 2012-01-27
Status: Merged
Approved by: dobey on 2012-01-31
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) 2012-01-27 Approve on 2012-01-31
Manuel de la Peña (community) 2012-01-27 Approve on 2012-01-31
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.
Natalia Bidart (nataliabidart) wrote :

Looks good! Can I test this IRL somehow?

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.

Manuel de la Peña (mandel) wrote :

Looks good.

review: Approve
Roberto Alsina (ralsina) wrote :

+1

review: Approve
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
1=== modified file '.bzrignore'
2--- .bzrignore 2011-02-09 20:58:13 +0000
3+++ .bzrignore 2012-01-27 22:37:25 +0000
4@@ -40,7 +40,6 @@
5 bindings/mono/*.cs
6 bindings/mono/ubuntuone.sources
7 bindings/mono/ubuntuone-api.xml
8-bindings/python/ubuntuone.c
9-libubuntuone/u1-marshal.[ch]
10+*/u1-marshal.[ch]
11
12 test-music-store
13
14=== modified file 'Makefile.am'
15--- Makefile.am 2012-01-12 18:09:00 +0000
16+++ Makefile.am 2012-01-27 22:37:25 +0000
17@@ -1,13 +1,10 @@
18-SUBDIRS = data libubuntuone tests po
19+SUBDIRS = data libubuntuone libubuntuoneui tests po
20
21 EXTRA_DIST = COPYING.GPL
22
23-pcfiles = libubuntuone-1.0.pc
24-
25-libubuntuone-1.0.pc: libubuntuone.pc
26- @cp -f $< $@
27-
28-ubuntuone-sharp-1.0.pc: ubuntuone-sharp.pc
29+pcfiles = libubuntuoneui-3.0.pc
30+
31+libubuntuoneui-3.0.pc: libubuntuoneui.pc
32 @cp -f $< $@
33
34 pkgconfig_DATA = $(pcfiles)
35
36=== modified file 'configure.ac'
37--- configure.ac 2012-01-12 18:09:00 +0000
38+++ configure.ac 2012-01-27 22:37:25 +0000
39@@ -18,7 +18,7 @@
40 AC_PROG_LIBTOOL
41
42 dnl i18n
43-IT_PROG_INTLTOOL([0.35.5])
44+IT_PROG_INTLTOOL([0.41.0])
45 AM_GLIB_GNU_GETTEXT
46
47 GETTEXT_PACKAGE=libubuntuone
48@@ -32,16 +32,16 @@
49 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
50
51 dnl Look for needed modules
52-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)
53-AC_SUBST(LIBUBUNTUONE_CFLAGS)
54-AC_SUBST(LIBUBUNTUONE_LIBS)
55+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)
56+AC_SUBST(LIBUBUNTUONEUI_CFLAGS)
57+AC_SUBST(LIBUBUNTUONEUI_LIBS)
58
59-LIBUBUNTUONE_CURRENT=1
60-LIBUBUNTUONE_REVISION=0
61-LIBUBUNTUONE_AGE=0
62-AC_SUBST(LIBUBUNTUONE_CURRENT)
63-AC_SUBST(LIBUBUNTUONE_REVISION)
64-AC_SUBST(LIBUBUNTUONE_AGE)
65+LIBUBUNTUONEUI_CURRENT=1
66+LIBUBUNTUONEUI_REVISION=0
67+LIBUBUNTUONEUI_AGE=0
68+AC_SUBST(LIBUBUNTUONEUI_CURRENT)
69+AC_SUBST(LIBUBUNTUONEUI_REVISION)
70+AC_SUBST(LIBUBUNTUONEUI_AGE)
71
72 AC_MSG_CHECKING([development series build])
73 DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`"
74@@ -75,13 +75,6 @@
75 AC_MSG_ERROR(You need openssl to build OAuth support)
76 fi
77
78-LIBUBUNTUONE_CURRENT=1
79-LIBUBUNTUONE_REVISION=0
80-LIBUBUNTUONE_AGE=0
81-AC_SUBST(LIBUBUNTUONE_CURRENT)
82-AC_SUBST(LIBUBUNTUONE_REVISION)
83-AC_SUBST(LIBUBUNTUONE_AGE)
84-
85 ##################################################
86 # Check for gtk-doc.
87 ##################################################
88@@ -90,7 +83,7 @@
89 AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
90
91 dnl JavaScript scripts location
92-U1_JAVASCRIPT_DIR=$datadir/libubuntuone/$LIBUBUNTUONE_CURRENT/javascript
93+U1_JAVASCRIPT_DIR=$datadir/libubuntuoneui/$LIBUBUNTUONEUI_CURRENT/javascript
94 AC_SUBST(U1_JAVASCRIPT_DIR)
95
96 ##################################################
97@@ -110,8 +103,9 @@
98 AC_CONFIG_FILES([
99 Makefile
100 data/Makefile
101-libubuntuone.pc
102 libubuntuone/Makefile
103+libubuntuoneui.pc
104+libubuntuoneui/Makefile
105 tests/Makefile
106 po/Makefile.in
107 ])
108
109=== added directory 'libubuntuone'
110=== added file 'libubuntuone/Makefile.am'
111=== renamed directory 'libubuntuone' => 'libubuntuoneui'
112=== renamed file 'libubuntuone.pc.in' => 'libubuntuoneui.pc.in'
113--- libubuntuone.pc.in 2009-11-23 18:07:47 +0000
114+++ libubuntuoneui.pc.in 2012-01-27 22:37:25 +0000
115@@ -3,9 +3,9 @@
116 libdir=${exec_prefix}/lib
117 includedir=${exec_prefix}/include
118
119-Name: libubuntuone
120+Name: libubuntuoneui
121 Description: Widget library for Ubuntu One integration in applications
122 Version: @VERSION@
123-Libs: -L${libdir} -lubuntuone-1.0
124-Cflags: -I${includedir}/libubuntuone-1.0
125-Requires: webkit-1.0
126+Libs: -L${libdir} -lubuntuoneui-3.0
127+Cflags: -I${includedir}/libubuntuoneui-3.0
128+Requires: webkitgtk-3.0
129
130=== modified file 'libubuntuoneui/Makefile.am'
131--- libubuntuone/Makefile.am 2011-04-01 17:19:03 +0000
132+++ libubuntuoneui/Makefile.am 2012-01-27 22:37:25 +0000
133@@ -1,10 +1,10 @@
134 CLEANFILES = $(MARSHAL_GENERATED)
135
136 INCLUDES = \
137- $(LIBUBUNTUONE_CFLAGS) \
138+ $(LIBUBUNTUONEUI_CFLAGS) \
139 -DU1_JAVASCRIPT_DIR=\"$(U1_JAVASCRIPT_DIR)\"
140
141-lib_LTLIBRARIES = libubuntuone-1.0.la
142+lib_LTLIBRARIES = libubuntuoneui-3.0.la
143
144 # Marshallers
145 MARSHAL_GENERATED = u1-marshal.c u1-marshal.h
146@@ -15,7 +15,7 @@
147 u1-marshal.c: u1-marshal.list $(GLIB_GENMARSHAL) u1-marshal.h
148 $(GLIB_GENMARSHAL) $< --body --prefix=_u1_marshal > $@
149
150-libubuntuone_1_0_la_SOURCES = \
151+libubuntuoneui_3_0_la_SOURCES = \
152 $(MARSHAL_GENERATED) \
153 oauth.c \
154 oauth.h \
155@@ -26,12 +26,12 @@
156 u1-request-chrome.h \
157 xmalloc.c \
158 xmalloc.h
159-libubuntuone_1_0_la_LDFLAGS = -version-info $(LIBUBUNTUONE_CURRENT):$(LIBUBUNTUONE_REVISION):$(LIBUBUNTUONE_AGE)
160-libubuntuone_1_0_la_LIBADD = \
161- $(LIBUBUNTUONE_LIBS) \
162+libubuntuoneui_3_0_la_LDFLAGS = -version-info $(LIBUBUNTUONEUI_CURRENT):$(LIBUBUNTUONEUI_REVISION):$(LIBUBUNTUONEUI_AGE)
163+libubuntuoneui_3_0_la_LIBADD = \
164+ $(LIBUBUNTUONEUI_LIBS) \
165 $(OAUTH_LIBS)
166
167-u1includedir = $(includedir)/libubuntuone-1.0
168+u1includedir = $(includedir)/libubuntuoneui-3.0
169 u1include_HEADERS = \
170 u1-music-store.h
171
172@@ -50,12 +50,12 @@
173 introspection_files = \
174 $(u1include_HEADERS) \
175 u1-music-store.c
176-UbuntuOne-1.0.gir: libubuntuone-1.0.la Makefile
177-UbuntuOne_1_0_gir_INCLUDES = Gtk-2.0 GLib-2.0
178-UbuntuOne_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
179-UbuntuOne_1_0_gir_LIBS = libubuntuone-1.0.la
180-UbuntuOne_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
181-INTROSPECTION_GIRS += UbuntuOne-1.0.gir
182+UbuntuOneUI-3.0.gir: libubuntuoneui-3.0.la Makefile
183+UbuntuOneUI_3_0_gir_INCLUDES = Gtk-3.0 GLib-2.0
184+UbuntuOneUI_3_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
185+UbuntuOneUI_3_0_gir_LIBS = libubuntuoneui-3.0.la
186+UbuntuOneUI_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
187+INTROSPECTION_GIRS += UbuntuOneUI-3.0.gir
188
189 girdir = $(datadir)/gir-1.0/
190 gir_DATA = $(INTROSPECTION_GIRS)
191
192=== modified file 'libubuntuoneui/u1-codec-installer.c'
193--- libubuntuone/u1-codec-installer.c 2011-12-20 09:12:56 +0000
194+++ libubuntuoneui/u1-codec-installer.c 2012-01-27 22:37:25 +0000
195@@ -230,10 +230,16 @@
196 if (g_strcmp0 (property, "ProgressDetails") == 0) {
197 gint transaction, items_done, items_total;
198 gint bytes_done, bytes_total, speed;
199- g_variant_get (value, "(iiiiii)", &transaction,
200- &items_done, &items_total,
201- &bytes_done, &bytes_total,
202- &speed);
203+ if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(iixxdx)")))
204+ g_variant_get (value, "(iixxdx)", &transaction,
205+ &items_done, &items_total,
206+ &bytes_done, &bytes_total,
207+ &speed);
208+ else
209+ g_variant_get (value, "(iiiiii)", &transaction,
210+ &items_done, &items_total,
211+ &bytes_done, &bytes_total,
212+ &speed);
213
214 if (items_total == 0 && bytes_total == 0)
215 gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), "");
216@@ -246,10 +252,10 @@
217 if (speed != 0) {
218 gchar *ks = g_format_size (speed);
219
220- message = g_strdup_printf (_("Downloaded %sB of %sB at %sB/s"), bd, bt, ks);
221+ message = g_strdup_printf (_("Downloaded %s of %s at %s/s"), bd, bt, ks);
222 g_free (ks);
223 } else
224- message = g_strdup_printf (_("Downloaded %sB of %sB"), bd, bt);
225+ message = g_strdup_printf (_("Downloaded %s of %s"), bd, bt);
226
227 gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), message);
228
229
230=== modified file 'libubuntuoneui/u1-music-store.c'
231--- libubuntuone/u1-music-store.c 2011-12-20 23:11:04 +0000
232+++ libubuntuoneui/u1-music-store.c 2012-01-27 22:37:25 +0000
233@@ -527,6 +527,7 @@
234 U1MusicStore *music_store = U1_MUSIC_STORE (user_data);
235 SoupURI *parsed_uri;
236 gchar *internal_uri;
237+ const gchar *network_uri;
238 gboolean return_val = FALSE;
239
240 /* Hide the alertbar in case we should show something else */
241@@ -548,7 +549,8 @@
242 if (parsed_uri == NULL)
243 return FALSE;
244
245- if (g_str_has_prefix (webkit_network_request_get_uri (request), U1_NOT_REGISTERED_URL)) {
246+ network_uri = webkit_network_request_get_uri (request);
247+ if (network_uri != NULL && g_str_has_prefix (network_uri, U1_NOT_REGISTERED_URL)) {
248 fire_authentication (music_store, request, policy_decision);
249 } else if (g_str_has_prefix (parsed_uri->path, "/auth/login") &&
250 g_strrstr (parsed_uri->query, "next=") != NULL) {
251
252=== modified file 'po/POTFILES.in'
253--- po/POTFILES.in 2011-04-07 14:11:59 +0000
254+++ po/POTFILES.in 2012-01-27 22:37:25 +0000
255@@ -1,3 +1,3 @@
256-libubuntuone/u1-codec-installer.c
257-libubuntuone/u1-music-store.c
258-libubuntuone/xmalloc.c
259+libubuntuoneui/u1-codec-installer.c
260+libubuntuoneui/u1-music-store.c
261+libubuntuoneui/xmalloc.c
262
263=== modified file 'tests/Makefile.am'
264--- tests/Makefile.am 2010-08-25 18:35:07 +0000
265+++ tests/Makefile.am 2012-01-27 22:37:25 +0000
266@@ -1,5 +1,5 @@
267 INCLUDES = \
268- $(LIBUBUNTUONE_CFLAGS) \
269+ $(LIBUBUNTUONEUI_CFLAGS) \
270 -I$(top_srcdir)
271
272 noinst_PROGRAMS = \
273@@ -7,7 +7,7 @@
274
275 test_music_store_SOURCES = test-music-store.c
276 test_music_store_LDADD = \
277- $(LIBUBUNTUONE_LIBS) \
278- $(top_builddir)/libubuntuone/libubuntuone-1.0.la
279+ $(LIBUBUNTUONEUI_LIBS) \
280+ $(top_builddir)/libubuntuoneui/libubuntuoneui-3.0.la
281
282 MAINTAINERCLEANFILES = Makefile.in
283
284=== modified file 'tests/test-music-store.c'
285--- tests/test-music-store.c 2011-12-18 10:23:12 +0000
286+++ tests/test-music-store.c 2012-01-27 22:37:25 +0000
287@@ -19,7 +19,7 @@
288 * Boston, MA 02110-1301, USA.
289 */
290
291-#include <libubuntuone/u1-music-store.h>
292+#include <libubuntuoneui/u1-music-store.h>
293
294 static void
295 preview_mp3_cb (U1MusicStore *music_store, const gchar *url, const gchar *title, gpointer user_data)
296
297=== removed file 'ubuntuone-sharp.pc.in'
298--- ubuntuone-sharp.pc.in 2010-03-08 15:38:36 +0000
299+++ ubuntuone-sharp.pc.in 1970-01-01 00:00:00 +0000
300@@ -1,12 +0,0 @@
301-prefix=${pcfiledir}/../..
302-exec_prefix=${prefix}
303-libdir=${exec_prefix}/lib
304-assemblies_dir=${libdir}/mono/ubuntuone-sharp-1.0
305-Libraries=${assemblies_dir}/ubuntuone-sharp.dll
306-
307-
308-Name: UbuntuOne#
309-Description: UbuntuOne# - Ubuntu One .NET Binding
310-Version: @VERSION@
311-Libs: -r:${Libraries}
312-

Subscribers

People subscribed via source and target branches