Merge lp:~dobey/libubuntuone/update-from-trunk into lp:libubuntuone/stable-3-0
- update-from-trunk
- Merge into stable-3-0
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 148 |
Proposed branch: | lp:~dobey/libubuntuone/update-from-trunk |
Merge into: | lp:libubuntuone/stable-3-0 |
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/update-from-trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Natalia Bidart (community) | Approve | ||
Review via email: mp+90951@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
Description of the change
Simple backport to stable-3-0 of what's already been merged in trunk, for the 2.99.3 release.
Ubuntu One Auto Pilot (otto-pilot) wrote : | # |
The attempt to merge lp:~dobey/libubuntuone/update-from-trunk into lp:libubuntuone/stable-3-0 failed. Below is the output from the failed tests.
/usr/bin/
checking for autoconf >= 2.53...
testing autoconf2.50... not found.
testing autoconf... found 2.68
checking for automake >= 1.6...
testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
testing libtoolize... found 2.4.2
checking for glib-gettext >= 2.2.0...
testing glib-gettextize... found 2.31.12
checking for intltool >= 0.30...
testing intltoolize... found 0.50.0
checking for pkg-config >= 0.14.0...
testing pkg-config... found 0.26
checking for gtk-doc >= 1.0...
testing gtkdocize... found 1.18
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/
libtoolize: `/usr/share/
libtoolize: `/usr/share/
libtoolize: `/usr/share/
libtoolize: `/usr/share/
libtoolize: Consider adding `AC_CONFIG_
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.
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 inttype...
Preview Diff
1 | === modified file '.bzrignore' | |||
2 | --- .bzrignore 2011-02-09 20:58:13 +0000 | |||
3 | +++ .bzrignore 2012-01-31 20:59:29 +0000 | |||
4 | @@ -40,7 +40,6 @@ | |||
5 | 40 | bindings/mono/*.cs | 40 | bindings/mono/*.cs |
6 | 41 | bindings/mono/ubuntuone.sources | 41 | bindings/mono/ubuntuone.sources |
7 | 42 | bindings/mono/ubuntuone-api.xml | 42 | bindings/mono/ubuntuone-api.xml |
10 | 43 | bindings/python/ubuntuone.c | 43 | */u1-marshal.[ch] |
9 | 44 | libubuntuone/u1-marshal.[ch] | ||
11 | 45 | 44 | ||
12 | 46 | test-music-store | 45 | test-music-store |
13 | 47 | 46 | ||
14 | === modified file 'Makefile.am' | |||
15 | --- Makefile.am 2012-01-12 18:09:00 +0000 | |||
16 | +++ Makefile.am 2012-01-31 20:59:29 +0000 | |||
17 | @@ -1,13 +1,10 @@ | |||
19 | 1 | SUBDIRS = data libubuntuone tests po | 1 | SUBDIRS = data libubuntuone libubuntuoneui tests po |
20 | 2 | 2 | ||
21 | 3 | EXTRA_DIST = COPYING.GPL | 3 | EXTRA_DIST = COPYING.GPL |
22 | 4 | 4 | ||
29 | 5 | pcfiles = libubuntuone-1.0.pc | 5 | pcfiles = libubuntuoneui-3.0.pc |
30 | 6 | 6 | ||
31 | 7 | libubuntuone-1.0.pc: libubuntuone.pc | 7 | libubuntuoneui-3.0.pc: libubuntuoneui.pc |
26 | 8 | @cp -f $< $@ | ||
27 | 9 | |||
28 | 10 | ubuntuone-sharp-1.0.pc: ubuntuone-sharp.pc | ||
32 | 11 | @cp -f $< $@ | 8 | @cp -f $< $@ |
33 | 12 | 9 | ||
34 | 13 | pkgconfig_DATA = $(pcfiles) | 10 | pkgconfig_DATA = $(pcfiles) |
35 | 14 | 11 | ||
36 | === modified file 'configure.ac' | |||
37 | --- configure.ac 2012-01-18 19:58:44 +0000 | |||
38 | +++ configure.ac 2012-01-31 20:59:29 +0000 | |||
39 | @@ -18,7 +18,7 @@ | |||
40 | 18 | AC_PROG_LIBTOOL | 18 | AC_PROG_LIBTOOL |
41 | 19 | 19 | ||
42 | 20 | dnl i18n | 20 | dnl i18n |
44 | 21 | IT_PROG_INTLTOOL([0.35.5]) | 21 | IT_PROG_INTLTOOL([0.41.0]) |
45 | 22 | AM_GLIB_GNU_GETTEXT | 22 | AM_GLIB_GNU_GETTEXT |
46 | 23 | 23 | ||
47 | 24 | GETTEXT_PACKAGE=libubuntuone | 24 | GETTEXT_PACKAGE=libubuntuone |
48 | @@ -32,16 +32,16 @@ | |||
49 | 32 | AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) | 32 | AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) |
50 | 33 | 33 | ||
51 | 34 | dnl Look for needed modules | 34 | dnl Look for needed modules |
55 | 35 | 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) | 35 | 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 | 36 | AC_SUBST(LIBUBUNTUONE_CFLAGS) | 36 | AC_SUBST(LIBUBUNTUONEUI_CFLAGS) |
57 | 37 | AC_SUBST(LIBUBUNTUONE_LIBS) | 37 | AC_SUBST(LIBUBUNTUONEUI_LIBS) |
58 | 38 | 38 | ||
65 | 39 | LIBUBUNTUONE_CURRENT=1 | 39 | LIBUBUNTUONEUI_CURRENT=1 |
66 | 40 | LIBUBUNTUONE_REVISION=0 | 40 | LIBUBUNTUONEUI_REVISION=0 |
67 | 41 | LIBUBUNTUONE_AGE=0 | 41 | LIBUBUNTUONEUI_AGE=0 |
68 | 42 | AC_SUBST(LIBUBUNTUONE_CURRENT) | 42 | AC_SUBST(LIBUBUNTUONEUI_CURRENT) |
69 | 43 | AC_SUBST(LIBUBUNTUONE_REVISION) | 43 | AC_SUBST(LIBUBUNTUONEUI_REVISION) |
70 | 44 | AC_SUBST(LIBUBUNTUONE_AGE) | 44 | AC_SUBST(LIBUBUNTUONEUI_AGE) |
71 | 45 | 45 | ||
72 | 46 | AC_MSG_CHECKING([development series build]) | 46 | AC_MSG_CHECKING([development series build]) |
73 | 47 | DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`" | 47 | DEVVERSION="`echo $PACKAGE_VERSION|cut -d. -f2`" |
74 | @@ -75,13 +75,6 @@ | |||
75 | 75 | AC_MSG_ERROR(You need openssl to build OAuth support) | 75 | AC_MSG_ERROR(You need openssl to build OAuth support) |
76 | 76 | fi | 76 | fi |
77 | 77 | 77 | ||
78 | 78 | LIBUBUNTUONE_CURRENT=1 | ||
79 | 79 | LIBUBUNTUONE_REVISION=0 | ||
80 | 80 | LIBUBUNTUONE_AGE=0 | ||
81 | 81 | AC_SUBST(LIBUBUNTUONE_CURRENT) | ||
82 | 82 | AC_SUBST(LIBUBUNTUONE_REVISION) | ||
83 | 83 | AC_SUBST(LIBUBUNTUONE_AGE) | ||
84 | 84 | |||
85 | 85 | ################################################## | 78 | ################################################## |
86 | 86 | # Check for gtk-doc. | 79 | # Check for gtk-doc. |
87 | 87 | ################################################## | 80 | ################################################## |
88 | @@ -90,7 +83,7 @@ | |||
89 | 90 | AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) | 83 | AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) |
90 | 91 | 84 | ||
91 | 92 | dnl JavaScript scripts location | 85 | dnl JavaScript scripts location |
93 | 93 | U1_JAVASCRIPT_DIR=$datadir/libubuntuone/$LIBUBUNTUONE_CURRENT/javascript | 86 | U1_JAVASCRIPT_DIR=$datadir/libubuntuoneui/$LIBUBUNTUONEUI_CURRENT/javascript |
94 | 94 | AC_SUBST(U1_JAVASCRIPT_DIR) | 87 | AC_SUBST(U1_JAVASCRIPT_DIR) |
95 | 95 | 88 | ||
96 | 96 | ################################################## | 89 | ################################################## |
97 | @@ -110,8 +103,9 @@ | |||
98 | 110 | AC_CONFIG_FILES([ | 103 | AC_CONFIG_FILES([ |
99 | 111 | Makefile | 104 | Makefile |
100 | 112 | data/Makefile | 105 | data/Makefile |
101 | 113 | libubuntuone.pc | ||
102 | 114 | libubuntuone/Makefile | 106 | libubuntuone/Makefile |
103 | 107 | libubuntuoneui.pc | ||
104 | 108 | libubuntuoneui/Makefile | ||
105 | 115 | tests/Makefile | 109 | tests/Makefile |
106 | 116 | po/Makefile.in | 110 | po/Makefile.in |
107 | 117 | ]) | 111 | ]) |
108 | 118 | 112 | ||
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-31 20:59:29 +0000 | |||
115 | @@ -3,9 +3,9 @@ | |||
116 | 3 | libdir=${exec_prefix}/lib | 3 | libdir=${exec_prefix}/lib |
117 | 4 | includedir=${exec_prefix}/include | 4 | includedir=${exec_prefix}/include |
118 | 5 | 5 | ||
120 | 6 | Name: libubuntuone | 6 | Name: libubuntuoneui |
121 | 7 | Description: Widget library for Ubuntu One integration in applications | 7 | Description: Widget library for Ubuntu One integration in applications |
122 | 8 | Version: @VERSION@ | 8 | Version: @VERSION@ |
126 | 9 | Libs: -L${libdir} -lubuntuone-1.0 | 9 | Libs: -L${libdir} -lubuntuoneui-3.0 |
127 | 10 | Cflags: -I${includedir}/libubuntuone-1.0 | 10 | Cflags: -I${includedir}/libubuntuoneui-3.0 |
128 | 11 | Requires: webkit-1.0 | 11 | Requires: webkitgtk-3.0 |
129 | 12 | 12 | ||
130 | === modified file 'libubuntuoneui/Makefile.am' | |||
131 | --- libubuntuone/Makefile.am 2011-04-01 17:19:03 +0000 | |||
132 | +++ libubuntuoneui/Makefile.am 2012-01-31 20:59:29 +0000 | |||
133 | @@ -1,10 +1,10 @@ | |||
134 | 1 | CLEANFILES = $(MARSHAL_GENERATED) | 1 | CLEANFILES = $(MARSHAL_GENERATED) |
135 | 2 | 2 | ||
136 | 3 | INCLUDES = \ | 3 | INCLUDES = \ |
138 | 4 | $(LIBUBUNTUONE_CFLAGS) \ | 4 | $(LIBUBUNTUONEUI_CFLAGS) \ |
139 | 5 | -DU1_JAVASCRIPT_DIR=\"$(U1_JAVASCRIPT_DIR)\" | 5 | -DU1_JAVASCRIPT_DIR=\"$(U1_JAVASCRIPT_DIR)\" |
140 | 6 | 6 | ||
142 | 7 | lib_LTLIBRARIES = libubuntuone-1.0.la | 7 | lib_LTLIBRARIES = libubuntuoneui-3.0.la |
143 | 8 | 8 | ||
144 | 9 | # Marshallers | 9 | # Marshallers |
145 | 10 | MARSHAL_GENERATED = u1-marshal.c u1-marshal.h | 10 | MARSHAL_GENERATED = u1-marshal.c u1-marshal.h |
146 | @@ -15,7 +15,7 @@ | |||
147 | 15 | u1-marshal.c: u1-marshal.list $(GLIB_GENMARSHAL) u1-marshal.h | 15 | u1-marshal.c: u1-marshal.list $(GLIB_GENMARSHAL) u1-marshal.h |
148 | 16 | $(GLIB_GENMARSHAL) $< --body --prefix=_u1_marshal > $@ | 16 | $(GLIB_GENMARSHAL) $< --body --prefix=_u1_marshal > $@ |
149 | 17 | 17 | ||
151 | 18 | libubuntuone_1_0_la_SOURCES = \ | 18 | libubuntuoneui_3_0_la_SOURCES = \ |
152 | 19 | $(MARSHAL_GENERATED) \ | 19 | $(MARSHAL_GENERATED) \ |
153 | 20 | oauth.c \ | 20 | oauth.c \ |
154 | 21 | oauth.h \ | 21 | oauth.h \ |
155 | @@ -26,12 +26,12 @@ | |||
156 | 26 | u1-request-chrome.h \ | 26 | u1-request-chrome.h \ |
157 | 27 | xmalloc.c \ | 27 | xmalloc.c \ |
158 | 28 | xmalloc.h | 28 | xmalloc.h |
162 | 29 | libubuntuone_1_0_la_LDFLAGS = -version-info $(LIBUBUNTUONE_CURRENT):$(LIBUBUNTUONE_REVISION):$(LIBUBUNTUONE_AGE) | 29 | libubuntuoneui_3_0_la_LDFLAGS = -version-info $(LIBUBUNTUONEUI_CURRENT):$(LIBUBUNTUONEUI_REVISION):$(LIBUBUNTUONEUI_AGE) |
163 | 30 | libubuntuone_1_0_la_LIBADD = \ | 30 | libubuntuoneui_3_0_la_LIBADD = \ |
164 | 31 | $(LIBUBUNTUONE_LIBS) \ | 31 | $(LIBUBUNTUONEUI_LIBS) \ |
165 | 32 | $(OAUTH_LIBS) | 32 | $(OAUTH_LIBS) |
166 | 33 | 33 | ||
168 | 34 | u1includedir = $(includedir)/libubuntuone-1.0 | 34 | u1includedir = $(includedir)/libubuntuoneui-3.0 |
169 | 35 | u1include_HEADERS = \ | 35 | u1include_HEADERS = \ |
170 | 36 | u1-music-store.h | 36 | u1-music-store.h |
171 | 37 | 37 | ||
172 | @@ -50,12 +50,12 @@ | |||
173 | 50 | introspection_files = \ | 50 | introspection_files = \ |
174 | 51 | $(u1include_HEADERS) \ | 51 | $(u1include_HEADERS) \ |
175 | 52 | u1-music-store.c | 52 | u1-music-store.c |
182 | 53 | UbuntuOne-1.0.gir: libubuntuone-1.0.la Makefile | 53 | UbuntuOneUI-3.0.gir: libubuntuoneui-3.0.la Makefile |
183 | 54 | UbuntuOne_1_0_gir_INCLUDES = Gtk-2.0 GLib-2.0 | 54 | UbuntuOneUI_3_0_gir_INCLUDES = Gtk-3.0 GLib-2.0 |
184 | 55 | UbuntuOne_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) | 55 | UbuntuOneUI_3_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir) |
185 | 56 | UbuntuOne_1_0_gir_LIBS = libubuntuone-1.0.la | 56 | UbuntuOneUI_3_0_gir_LIBS = libubuntuoneui-3.0.la |
186 | 57 | UbuntuOne_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) | 57 | UbuntuOneUI_3_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files)) |
187 | 58 | INTROSPECTION_GIRS += UbuntuOne-1.0.gir | 58 | INTROSPECTION_GIRS += UbuntuOneUI-3.0.gir |
188 | 59 | 59 | ||
189 | 60 | girdir = $(datadir)/gir-1.0/ | 60 | girdir = $(datadir)/gir-1.0/ |
190 | 61 | gir_DATA = $(INTROSPECTION_GIRS) | 61 | gir_DATA = $(INTROSPECTION_GIRS) |
191 | 62 | 62 | ||
192 | === modified file 'libubuntuoneui/u1-codec-installer.c' | |||
193 | --- libubuntuone/u1-codec-installer.c 2012-01-18 18:05:51 +0000 | |||
194 | +++ libubuntuoneui/u1-codec-installer.c 2012-01-31 20:59:29 +0000 | |||
195 | @@ -230,10 +230,16 @@ | |||
196 | 230 | if (g_strcmp0 (property, "ProgressDetails") == 0) { | 230 | if (g_strcmp0 (property, "ProgressDetails") == 0) { |
197 | 231 | gint transaction, items_done, items_total; | 231 | gint transaction, items_done, items_total; |
198 | 232 | gint bytes_done, bytes_total, speed; | 232 | gint bytes_done, bytes_total, speed; |
203 | 233 | g_variant_get (value, "(iiiiii)", &transaction, | 233 | if (g_variant_is_of_type (value, G_VARIANT_TYPE ("(iixxdx)"))) |
204 | 234 | &items_done, &items_total, | 234 | g_variant_get (value, "(iixxdx)", &transaction, |
205 | 235 | &bytes_done, &bytes_total, | 235 | &items_done, &items_total, |
206 | 236 | &speed); | 236 | &bytes_done, &bytes_total, |
207 | 237 | &speed); | ||
208 | 238 | else | ||
209 | 239 | g_variant_get (value, "(iiiiii)", &transaction, | ||
210 | 240 | &items_done, &items_total, | ||
211 | 241 | &bytes_done, &bytes_total, | ||
212 | 242 | &speed); | ||
213 | 237 | 243 | ||
214 | 238 | if (items_total == 0 && bytes_total == 0) | 244 | if (items_total == 0 && bytes_total == 0) |
215 | 239 | gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), ""); | 245 | gtk_progress_bar_set_text (GTK_PROGRESS_BAR (installer->priv->progressbar), ""); |
216 | @@ -246,10 +252,10 @@ | |||
217 | 246 | if (speed != 0) { | 252 | if (speed != 0) { |
218 | 247 | gchar *ks = g_format_size (speed); | 253 | gchar *ks = g_format_size (speed); |
219 | 248 | 254 | ||
221 | 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); |
222 | 250 | g_free (ks); | 256 | g_free (ks); |
223 | 251 | } else | 257 | } else |
225 | 252 | message = g_strdup_printf (_("Downloaded %sB of %sB"), bd, bt); | 258 | message = g_strdup_printf (_("Downloaded %s of %s"), bd, bt); |
226 | 253 | 259 | ||
227 | 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); |
228 | 255 | 261 | ||
229 | 256 | 262 | ||
230 | === modified file 'libubuntuoneui/u1-music-store.c' | |||
231 | --- libubuntuone/u1-music-store.c 2012-01-18 18:05:51 +0000 | |||
232 | +++ libubuntuoneui/u1-music-store.c 2012-01-31 20:59:29 +0000 | |||
233 | @@ -527,6 +527,7 @@ | |||
234 | 527 | U1MusicStore *music_store = U1_MUSIC_STORE (user_data); | 527 | U1MusicStore *music_store = U1_MUSIC_STORE (user_data); |
235 | 528 | SoupURI *parsed_uri; | 528 | SoupURI *parsed_uri; |
236 | 529 | gchar *internal_uri; | 529 | gchar *internal_uri; |
237 | 530 | const gchar *network_uri; | ||
238 | 530 | gboolean return_val = FALSE; | 531 | gboolean return_val = FALSE; |
239 | 531 | 532 | ||
240 | 532 | /* Hide the alertbar in case we should show something else */ | 533 | /* Hide the alertbar in case we should show something else */ |
241 | @@ -548,7 +549,8 @@ | |||
242 | 548 | if (parsed_uri == NULL) | 549 | if (parsed_uri == NULL) |
243 | 549 | return FALSE; | 550 | return FALSE; |
244 | 550 | 551 | ||
246 | 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); |
247 | 553 | if (network_uri != NULL && g_str_has_prefix (network_uri, U1_NOT_REGISTERED_URL)) { | ||
248 | 552 | fire_authentication (music_store, request, policy_decision); | 554 | fire_authentication (music_store, request, policy_decision); |
249 | 553 | } else if (g_str_has_prefix (parsed_uri->path, "/auth/login") && | 555 | } else if (g_str_has_prefix (parsed_uri->path, "/auth/login") && |
250 | 554 | g_strrstr (parsed_uri->query, "next=") != NULL) { | 556 | g_strrstr (parsed_uri->query, "next=") != NULL) { |
251 | 555 | 557 | ||
252 | === modified file 'po/POTFILES.in' | |||
253 | --- po/POTFILES.in 2011-04-07 14:11:59 +0000 | |||
254 | +++ po/POTFILES.in 2012-01-31 20:59:29 +0000 | |||
255 | @@ -1,3 +1,3 @@ | |||
259 | 1 | libubuntuone/u1-codec-installer.c | 1 | libubuntuoneui/u1-codec-installer.c |
260 | 2 | libubuntuone/u1-music-store.c | 2 | libubuntuoneui/u1-music-store.c |
261 | 3 | libubuntuone/xmalloc.c | 3 | libubuntuoneui/xmalloc.c |
262 | 4 | 4 | ||
263 | === modified file 'tests/Makefile.am' | |||
264 | --- tests/Makefile.am 2010-08-25 18:35:07 +0000 | |||
265 | +++ tests/Makefile.am 2012-01-31 20:59:29 +0000 | |||
266 | @@ -1,5 +1,5 @@ | |||
267 | 1 | INCLUDES = \ | 1 | INCLUDES = \ |
269 | 2 | $(LIBUBUNTUONE_CFLAGS) \ | 2 | $(LIBUBUNTUONEUI_CFLAGS) \ |
270 | 3 | -I$(top_srcdir) | 3 | -I$(top_srcdir) |
271 | 4 | 4 | ||
272 | 5 | noinst_PROGRAMS = \ | 5 | noinst_PROGRAMS = \ |
273 | @@ -7,7 +7,7 @@ | |||
274 | 7 | 7 | ||
275 | 8 | test_music_store_SOURCES = test-music-store.c | 8 | test_music_store_SOURCES = test-music-store.c |
276 | 9 | test_music_store_LDADD = \ | 9 | test_music_store_LDADD = \ |
279 | 10 | $(LIBUBUNTUONE_LIBS) \ | 10 | $(LIBUBUNTUONEUI_LIBS) \ |
280 | 11 | $(top_builddir)/libubuntuone/libubuntuone-1.0.la | 11 | $(top_builddir)/libubuntuoneui/libubuntuoneui-3.0.la |
281 | 12 | 12 | ||
282 | 13 | MAINTAINERCLEANFILES = Makefile.in | 13 | MAINTAINERCLEANFILES = Makefile.in |
283 | 14 | 14 | ||
284 | === modified file 'tests/test-music-store.c' | |||
285 | --- tests/test-music-store.c 2012-01-18 18:05:51 +0000 | |||
286 | +++ tests/test-music-store.c 2012-01-31 20:59:29 +0000 | |||
287 | @@ -19,7 +19,7 @@ | |||
288 | 19 | * Boston, MA 02110-1301, USA. | 19 | * Boston, MA 02110-1301, USA. |
289 | 20 | */ | 20 | */ |
290 | 21 | 21 | ||
292 | 22 | #include <libubuntuone/u1-music-store.h> | 22 | #include <libubuntuoneui/u1-music-store.h> |
293 | 23 | 23 | ||
294 | 24 | static void | 24 | static void |
295 | 25 | preview_mp3_cb (U1MusicStore *music_store, const gchar *url, const gchar *title, gpointer user_data) | 25 | preview_mp3_cb (U1MusicStore *music_store, const gchar *url, const gchar *title, gpointer user_data) |
296 | 26 | 26 | ||
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 | 1 | prefix=${pcfiledir}/../.. | ||
302 | 2 | exec_prefix=${prefix} | ||
303 | 3 | libdir=${exec_prefix}/lib | ||
304 | 4 | assemblies_dir=${libdir}/mono/ubuntuone-sharp-1.0 | ||
305 | 5 | Libraries=${assemblies_dir}/ubuntuone-sharp.dll | ||
306 | 6 | |||
307 | 7 | |||
308 | 8 | Name: UbuntuOne# | ||
309 | 9 | Description: UbuntuOne# - Ubuntu One .NET Binding | ||
310 | 10 | Version: @VERSION@ | ||
311 | 11 | Libs: -r:${Libraries} | ||
312 | 12 |
Looks good.