Merge lp:~dobey/libubuntuone/default-encoding-lucid into lp:libubuntuone/stable-lucid
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | dobey |
Approved revision: | 89 |
Merged at revision: | 89 |
Proposed branch: | lp:~dobey/libubuntuone/default-encoding-lucid |
Merge into: | lp:libubuntuone/stable-lucid |
Diff against target: |
41 lines (+8/-1) 1 file modified
libubuntuone/u1-music-store.c (+8/-1) |
To merge this branch: | bzr merge lp:~dobey/libubuntuone/default-encoding-lucid |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Casteleijn (community) | Approve | ||
Chad Miller (community) | Approve | ||
Review via email: mp+57930@code.launchpad.net |
Commit message
Set the default encoding in the web view to UTF-8
Use the UTF-8 encoding when parsing the HTML for status checking
Description of the change
To test:
Have a song purchased from U1MS have accented/extended characters in UTF-8.
./autogen.sh
make U1_JAVASCRIPT_
./tests/
Go to the "My Downloads" page. Without this fix, the extended character songs should say "transferring" forever. With this fix, they should behave normally like the rest.
To post a comment you must log in.
The attempt to merge lp:~dobey/libubuntuone/default-encoding-lucid into lp:libubuntuone/stable-lucid failed. Below is the output from the failed tests.
/usr/bin/ gnome-autogen. sh aclocal/ libtool. m4' aclocal/ ltoptions. m4' aclocal/ ltversion. m4' aclocal/ ltsugar. m4' aclocal/ lt~obsolete. m4' MACRO_DIR( [m4])' to configure.ac and
checking for autoconf >= 2.53...
testing autoconf2.50... not found.
testing autoconf... found 2.65
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.24.1
checking for intltool >= 0.30...
testing intltoolize... found 0.41.0
checking for pkg-config >= 0.14.0...
testing pkg-config... found 0.22
checking for gtk-doc >= 1.0...
testing gtkdocize... found 1.14
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 gnu.org/ pub/gnu/ config/.
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 ...
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... y...