Merge into trunk : fix-server-show : Code : Ubuntu One Client

Status:

Merged

Approved by:

Eric Casteleijn on 2011-02-23

Approved revision:

892

Merged at revision:

890

Proposed branch:

lp://staging/~thisfred/ubuntuone-client/fix-server-show

Merge into:

lp://staging/ubuntuone-client

Diff against target:

191 lines (+46/-29)

3 files modified

tests/platform/linux/test_messaging.py (+19/-12)
ubuntuone/platform/linux/messaging.py (+23/-15)
ubuntuone/status/aggregator.py (+4/-2)

To merge this branch:

bzr merge lp://staging/~thisfred/ubuntuone-client/fix-server-show

Related bugs:

Bug #721525: Two Ubuntu One entries in the Message Panel	Medium	Fix Released
Bug #723856: u1client does not use the messaging menu correctly	High	Fix Released

Link a bug report

Reviewer	Date Requested	Status
Natalia Bidart (community)		Approve on 2011-02-23
Alejandro J. Cura (community)	2011-02-23	Approve on 2011-02-23
Review via email: mp+50962@code.staging.launchpad.net

Commit message

This adds the correct callback for the server entry in the messaging menu, and calls server.show() only once, rather than every time a message is added.

Description of the change

This adds the correct callback for the server entry in the messaging menu, and calls server.show() only once, rather than every time a message is added.

Revision history for this message

Alejandro J. Cura (alecu) wrote on 2011-02-23:

#

Working for me as intended

review: Approve

Revision history for this message

Natalia Bidart (nataliabidart) wrote on 2011-02-23:

#

This branch fixes the opening of the control panel when clicking in the messaging entry. I still have 2 entries when syncdaemon is not running.

review: Approve

Revision history for this message

Ubuntu One Auto Pilot (otto-pilot) wrote on 2011-02-23:

#

Download full text (31.9 KiB)

The attempt to merge lp:~thisfred/ubuntuone-client/fix-server-show into lp:ubuntuone-client 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.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
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.16
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: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
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... gawk
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 for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent lib...

The attempt to merge lp:~thisfred/ubuntuone-client/fix-server-show into lp:ubuntuone-client 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.10...
  testing automake-1.11... found 1.11.1
checking for libtool >= 1.5...
  testing libtoolize... found 2.2.6b
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.16
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: putting macros in AC_CONFIG_MACRO_DIR, `m4'.
libtoolize: copying file `m4/libtool.m4'
libtoolize: copying file `m4/ltoptions.m4'
libtoolize: copying file `m4/ltsugar.m4'
libtoolize: copying file `m4/ltversion.m4'
libtoolize: copying file `m4/lt~obsolete.m4'
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... gawk
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 for library containing strerror... none required
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking build system type... i686-pc-linux-gnu
checking host system type... i686-pc-linux-gnu
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for fgrep... /bin/grep -F
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for BSD- or MS-compatible name lister (nm)... /usr/bin/nm -B
checking the name lister (/usr/bin/nm -B) interface... BSD nm
checking whether ln -s works... yes
checking the maximum length of command line arguments... 1572864
checking whether the shell understands some XSI constructs... yes
checking whether the shell understands "+="... yes
checking for /usr/bin/ld option to reload object files... -r
checking for objdump... objdump
checking how to recognize dependent libraries... pass_all
checking for ar... ar
checking for strip... strip
checking for ranlib... ranlib
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking how to run the C preprocessor... gcc -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
checking for stdint.h... yes
checking for unistd.h... yes
checking for dlfcn.h... yes
checking for objdir... .libs
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC -DPIC
checking if gcc PIC flag -fPIC -DPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking if gcc supports -c -o file.o... (cached) yes
checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... yes
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.19... yes
checking whether NLS is requested... yes
checking for intltool >= 0.40.0... 0.41.1 found
checking for intltool-update... /usr/bin/intltool-update
checking for intltool-merge... /usr/bin/intltool-merge
checking for intltool-extract... /usr/bin/intltool-extract
checking for xgettext... /usr/bin/xgettext
checking for msgmerge... /usr/bin/msgmerge
checking for msgfmt... /usr/bin/msgfmt
checking for gmsgfmt... /usr/bin/msgfmt
checking for perl... /usr/bin/perl
checking for perl >= 5.8.1... 5.10.1
checking for XML::Parser... ok
checking for lndir... /usr/bin/lndir
checking for icontool-render... /usr/bin/icontool-render
checking development series build... yes
checking for a Python interpreter with version >= 2.5... python
checking for python... /usr/bin/python
checking for python version... 2.7
checking for python platform... linux2
checking for python script directory... ${prefix}/lib/python2.7/dist-packages
checking for python extension module directory... ${exec_prefix}/lib/python2.7/dist-packages
checking for pycentral... no
checking for ubuntu-sso-client... using system path
checking for ubuntuone-storage-protocol... using system path
checking for NAUTILUS... yes
checking for DBUS... yes
checking whether to build contacts grid or list view... list
checking for gtkdoc-check... /usr/bin/gtkdoc-check
checking for gtkdoc-rebase... /usr/bin/gtkdoc-rebase
checking for gtkdoc-mkpdf... /usr/bin/gtkdoc-mkpdf
checking whether to build gtk-doc documentation... yes
checking for gobject-introspection... yes
checking if gobject-introspection requires new options... yes
checking whether to enable vapi generation... yes
checking for vapigen... /usr/bin/vapigen
checking for valac... /usr/bin/valac
checking for glib-genmarshal... /usr/bin/glib-genmarshal
checking for SETTINGS_PLUGIN... yes
configure: creating ./config.status
config.status: creating Makefile
config.status: creating data/Makefile
config.status: creating libsyncdaemon/Makefile
config.status: creating libsyncdaemon/libsyncdaemon-1.0.pc
config.status: creating nautilus/Makefile
config.status: creating po/Makefile.in
config.status: creating gsd-plugin/Makefile
config.status: creating docs/Makefile
config.status: creating docs/reference/Makefile
config.status: creating config.h
config.status: executing depfiles commands
config.status: executing libtool commands
config.status: executing po/stamp-it commands
Now type `make' to compile ubuntuone-client
make: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/libsyncdaemon'
/usr/bin/glib-genmarshal syncdaemon-marshal.list --header --prefix=_syncdaemon_marshal > syncdaemon-marshal.h
/usr/bin/glib-genmarshal syncdaemon-marshal.list --body --prefix=_syncdaemon_marshal > syncdaemon-marshal.c
  CC     syncdaemon-marshal.lo
  CC     syncdaemon-authentication.lo
  CC     syncdaemon-daemon.lo
  CC     syncdaemon-config-interface.lo
  CC     syncdaemon-credentials.lo
  CC     syncdaemon-events-interface.lo
  CC     syncdaemon-file-info.lo
  CC     syncdaemon-filesystem-interface.lo
  CC     syncdaemon-folder-info.lo
  CC     syncdaemon-folders-interface.lo
  CC     syncdaemon-metadata.lo
  CC     syncdaemon-publicfiles-interface.lo
  CC     syncdaemon-share-info.lo
  CC     syncdaemon-shares-interface.lo
  CC     syncdaemon-status-info.lo
  CC     syncdaemon-status-interface.lo
  CC     syncdaemon-transfer-info.lo
  CC     syncdaemon-interface.lo
  CC     utils.lo
  CCLD   libsyncdaemon-1.0.la
  CC     test-libsyncdaemon.o
  CCLD   test-libsyncdaemon
  GISCAN Syncdaemon-1.0.gir
/usr/bin/vapigen --pkg gobject-2.0 --library libsyncdaemon-1.0 Syncdaemon-1.0.gir
Generation succeeded - 0 warning(s)
  VALAC  test_libsyncdaemon_vapi_vala.stamp
  CC     test-libsyncdaemon-vapi.o
  CCLD   test-libsyncdaemon-vapi
  GICOMP Syncdaemon-1.0.gir
cp libsyncdaemon-vala.deps libsyncdaemon-1.0.deps
make: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/libsyncdaemon'
make: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
Making all in reference
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs/reference'
gtk-doc: Scanning header files
for i in ../../libsyncdaemon ; do \
	    _source_dir="${_source_dir} --source-dir=$i" ; \
	done ; \
	gtkdoc-scan --module=libsyncdaemon --ignore-headers="utils.h" ${_source_dir}  
gtk-doc: Compiling scanner
libtool: compile:  gcc -I../../libsyncdaemon -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -g -O2 -Wall -Werror -g -O2 -Wall -Werror -c libsyncdaemon-scan.c  -fPIC -DPIC -o .libs/libsyncdaemon-scan.o
libtool: compile:  gcc -I../../libsyncdaemon -pthread -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -g -O2 -Wall -Werror -g -O2 -Wall -Werror -c libsyncdaemon-scan.c -o libsyncdaemon-scan.o >/dev/null 2>&1
gtk-doc: Linking scanner
libtool: link: gcc -g -O2 -Wall -Werror .libs/libsyncdaemon-scan.o -pthread -o .libs/libsyncdaemon-scan  -L/lib -ldbus-glib-1 -ldbus-1 -lpthread /usr/lib/libgobject-2.0.so /usr/lib/libgthread-2.0.so -lrt /usr/lib/libglib-2.0.so ../../libsyncdaemon/.libs/libsyncdaemon-1.0.so -pthread 
gtk-doc: Running scanner libsyncdaemon-scan
gtk-doc: Rebuilding template files
gtk-doc: Building XML
./tmpl/syncdaemon-file-info.sgml:31: warning: Field descriptions for SyncdaemonFileInfoClass are missing in source code comment block.
./tmpl/syncdaemon-folders-interface.sgml:31: warning: Field descriptions for SyncdaemonFoldersInterfaceClass are missing in source code comment block.
./tmpl/syncdaemon-filesystem-interface.sgml:31: warning: Field descriptions for SyncdaemonFilesystemInterfaceClass are missing in source code comment block.
./tmpl/syncdaemon-metadata.sgml:31: warning: Field descriptions for SyncdaemonMetadataClass are missing in source code comment block.
./tmpl/syncdaemon-config-interface.sgml:31: warning: Field descriptions for SyncdaemonConfigInterfaceClass are missing in source code comment block.
./tmpl/syncdaemon-transfer-info.sgml:31: warning: Field descriptions for SyncdaemonTransferInfoClass are missing in source code comment block.
./tmpl/syncdaemon-status-interface.sgml:31: warning: Field descriptions for SyncdaemonStatusInterfaceClass are missing in source code comment block.
./tmpl/syncdaemon-daemon.sgml:209: warning: Field descriptions for SyncdaemonDaemonClass are missing in source code comment block.
./tmpl/syncdaemon-publicfiles-interface.sgml:31: warning: Field descriptions for SyncdaemonPublicfilesInterfaceClass are missing in source code comment block.
./tmpl/syncdaemon-interface.sgml:36: warning: Field descriptions for SyncdaemonInterfaceClass are missing in source code comment block.
./tmpl/syncdaemon-share-info.sgml:31: warning: Field descriptions for SyncdaemonShareInfoClass are missing in source code comment block.
./tmpl/syncdaemon-share-info.sgml:38: warning: Value descriptions for SyncdaemonShareInfoType are missing in source code comment block.
./tmpl/syncdaemon-status-info.sgml:31: warning: Field descriptions for SyncdaemonStatusInfoClass are missing in source code comment block.
./tmpl/syncdaemon-shares-interface.sgml:31: warning: Field descriptions for SyncdaemonSharesInterfaceClass are missing in source code comment block.
./tmpl/syncdaemon-authentication.sgml:54: warning: Field descriptions for SyncdaemonAuthenticationClass are missing in source code comment block.
./tmpl/syncdaemon-credentials.sgml:31: warning: Field descriptions for SyncdaemonCredentialsClass are missing in source code comment block.
./tmpl/syncdaemon-folder-info.sgml:31: warning: Field descriptions for SyncdaemonFolderInfoClass are missing in source code comment block.
./tmpl/syncdaemon-events-interface.sgml:31: warning: Field descriptions for SyncdaemonEventsInterfaceClass are missing in source code comment block.
gtk-doc: Building HTML
gtk-doc: Fixing cross-references
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs/reference'
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
make[1]: Nothing to be done for `all-am'.
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
make: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
if test "x." != "x."; then \
		if [ ! -e pylintrc -a ! -h pylintrc ]; then \
			ln -s ./pylintrc; \
		fi; \
	fi
{ test ! -d "ubuntuone-client-1.5.4" || { find "ubuntuone-client-1.5.4" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr "ubuntuone-client-1.5.4"; }; }
test -d "ubuntuone-client-1.5.4" || mkdir "ubuntuone-client-1.5.4"
 (cd data && make  top_distdir=../ubuntuone-client-1.5.4 distdir=../ubuntuone-client-1.5.4/data \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
if [ ! -h hicolor -a -d icons ]; then \
		ln -s icons hicolor; \
	fi
for size in 16x16 24x24 32x32 48x48; do \
		/usr/bin/icontool-render -s $size -o ./icons ubuntuone-icons.svg > ubuntuone-icons.rendercache; \
	done
touch stamp-render
make  \
	  top_distdir="../ubuntuone-client-1.5.4" distdir="../ubuntuone-client-1.5.4/data" \
	  dist-hook
make[2]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
if [ ! -h hicolor -a -d icons ]; then \
		ln -s icons hicolor; \
	fi
/bin/mkdir -p ../ubuntuone-client-1.5.4/data/icons
for size in 16x16 24x24 32x32 48x48; do \
		cp -a ./icons/$size ../ubuntuone-client-1.5.4/data/icons/$size; \
	done
for i in ubuntuone-icons.rendercache; do \
		touch ../ubuntuone-client-1.5.4/data/$i; \
	done
make[2]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
 (cd libsyncdaemon && make  top_distdir=../ubuntuone-client-1.5.4 distdir=../ubuntuone-client-1.5.4/libsyncdaemon \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/libsyncdaemon'
  VALAC  libsyncdaemon_1_0_la_vala.stamp
  VALAC  test_libsyncdaemon_vala.stamp
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/libsyncdaemon'
 (cd nautilus && make  top_distdir=../ubuntuone-client-1.5.4 distdir=../ubuntuone-client-1.5.4/nautilus \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/nautilus'
glib-genmarshal --body --prefix=ubuntuone_nautilus_marshal ubuntuone-marshallers.list > ubuntuone-marshallers.c
glib-genmarshal --header --prefix=ubuntuone_nautilus_marshal ubuntuone-marshallers.list > ubuntuone-marshallers.h
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/nautilus'
 (cd po && make  top_distdir=../ubuntuone-client-1.5.4 distdir=../ubuntuone-client-1.5.4/po \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/po'
dists="Makefile.in.in POTFILES.in ar.po ast.po ca.po da.po de.po el.po en_GB.po es.po fi.po fr.po hr.po hu.po it.po ja.po lv.po ms.po nl.po pt.po pt_BR.po ro.po ru.po sk.po sv.po th.po tr.po uk.po zh_CN.po "; \
	extra_dists="ChangeLog POTFILES.skip Makevars LINGUAS"; \
	for file in $extra_dists; do \
	  test -f ./$file && dists="$dists ./$file"; \
	done; \
	for file in $dists; do \
	  test -f $file || file="./$file"; \
	  ln $file ../ubuntuone-client-1.5.4/po 2> /dev/null \
	    || cp -p $file ../ubuntuone-client-1.5.4/po; \
	done
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/po'
 (cd gsd-plugin && make  top_distdir=../ubuntuone-client-1.5.4 distdir=../ubuntuone-client-1.5.4/gsd-plugin \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/gsd-plugin'
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/gsd-plugin'
 (cd docs && make  top_distdir=../ubuntuone-client-1.5.4 distdir=../ubuntuone-client-1.5.4/docs \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
 (cd reference && make  top_distdir=../../ubuntuone-client-1.5.4 distdir=../../ubuntuone-client-1.5.4/docs/reference \
     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)
make[2]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs/reference'
make  \
	  top_distdir="../../ubuntuone-client-1.5.4" distdir="../../ubuntuone-client-1.5.4/docs/reference" \
	  dist-hook
make[3]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs/reference'
mkdir ../../ubuntuone-client-1.5.4/docs/reference/tmpl
mkdir ../../ubuntuone-client-1.5.4/docs/reference/html
cp ./tmpl/*.sgml ../../ubuntuone-client-1.5.4/docs/reference/tmpl
cp ./html/* ../../ubuntuone-client-1.5.4/docs/reference/html
cp ./libsyncdaemon.pdf ../../ubuntuone-client-1.5.4/docs/reference/
cp ./libsyncdaemon.types ../../ubuntuone-client-1.5.4/docs/reference/
cp ./libsyncdaemon-sections.txt ../../ubuntuone-client-1.5.4/docs/reference/
cd ../../ubuntuone-client-1.5.4/docs/reference && rm -f 
/usr/bin/gtkdoc-rebase --online --relative --html-dir=../../ubuntuone-client-1.5.4/docs/reference/html
/usr/share/gtk-doc/html/glib/ -> http://library.gnome.org/devel/glib/unstable/ (381)
/usr/share/gtk-doc/html/gobject/ -> http://library.gnome.org/devel/gobject/unstable/ (84)
make[3]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs/reference'
make[2]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs/reference'
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
test -n "" \
	|| find "ubuntuone-client-1.5.4" -type d ! -perm -755 \
		-exec chmod u+rwx,go+rx {} \; -o \
	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
	  ! -type d ! -perm -444 -exec /bin/bash /var/cache/tarmac/ubuntuone-client/trunk/install-sh -c -m a+r {} {} \; \
	|| chmod -R a+r "ubuntuone-client-1.5.4"
tardir=ubuntuone-client-1.5.4 && /bin/bash /var/cache/tarmac/ubuntuone-client/trunk/missing --run tar chof - "$tardir" | GZIP=--best gzip -c >ubuntuone-client-1.5.4.tar.gz
{ test ! -d "ubuntuone-client-1.5.4" || { find "ubuntuone-client-1.5.4" -type d ! -perm -200 -exec chmod u+w {} ';' && rm -fr "ubuntuone-client-1.5.4"; }; }
Making check in data
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
LC_ALL=C /usr/bin/intltool-merge -d -u -c ../po/.intltool-merge-cache ../po ubuntuone-launch.desktop.in ubuntuone-launch.desktop
Generating and caching the translation database
Merging translations into ubuntuone-launch.desktop.
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
Making check in libsyncdaemon
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/libsyncdaemon'
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/libsyncdaemon'
Making check in nautilus
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/nautilus'
  CC     libnautilus_ubuntuone_la-add-contact-dialog.lo
  CC     libnautilus_ubuntuone_la-contacts-view.lo
  CC     libnautilus_ubuntuone_la-context-menu.lo
  CC     libnautilus_ubuntuone_la-error-dialog.lo
  CC     libnautilus_ubuntuone_la-file-watcher.lo
  CC     libnautilus_ubuntuone_la-location-widget.lo
  CC     libnautilus_ubuntuone_la-highlight.lo
  CC     libnautilus_ubuntuone_la-share-dialog.lo
  CC     libnautilus_ubuntuone_la-u1-contacts-picker.lo
  CC     libnautilus_ubuntuone_la-ubuntuone-marshallers.lo
  CC     libnautilus_ubuntuone_la-ubuntuone-nautilus.lo
  CC     libnautilus_ubuntuone_la-utils.lo
  CCLD   libnautilus-ubuntuone.la
  CC     test_contacts_picker-test-contacts-picker.o
  CC     test_contacts_picker-add-contact-dialog.o
  CC     test_contacts_picker-contacts-view.o
  CC     test_contacts_picker-highlight.o
  CC     test_contacts_picker-u1-contacts-picker.o
  CCLD   test-contacts-picker
  CC     test_highlight-highlight.o
  CC     test_highlight-test-highlight.o
  CCLD   test-highlight
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/nautilus'
Making check in po
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/po'
file=`echo ar | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file ar.po
file=`echo ast | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file ast.po
file=`echo ca | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file ca.po
file=`echo da | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file da.po
file=`echo de | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file de.po
file=`echo el | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file el.po
file=`echo en_GB | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file en_GB.po
file=`echo es | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file es.po
file=`echo fi | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file fi.po
file=`echo fr | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file fr.po
file=`echo hr | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file hr.po
file=`echo hu | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file hu.po
file=`echo it | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file it.po
file=`echo ja | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file ja.po
file=`echo lv | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file lv.po
file=`echo ms | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file ms.po
file=`echo nl | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file nl.po
file=`echo pt | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file pt.po
file=`echo pt_BR | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file pt_BR.po
file=`echo ro | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file ro.po
file=`echo ru | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file ru.po
file=`echo sk | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file sk.po
file=`echo sv | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file sv.po
file=`echo th | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file th.po
file=`echo tr | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file tr.po
file=`echo uk | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file uk.po
file=`echo zh_CN | sed 's,.*/,,'`.gmo \
	  && rm -f $file && /usr/bin/msgfmt -o $file zh_CN.po
INTLTOOL_EXTRACT=/usr/bin/intltool-extract srcdir=. /usr/bin/intltool-update --gettext-package ubuntuone-client --pot
rm -f missing notexist
srcdir=. /usr/bin/intltool-update -m
if [ -r missing -o -r notexist ]; then \
	  exit 1; \
	fi
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/po'
Making check in gsd-plugin
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/gsd-plugin'
  CC     libubuntuone_la-gsd-ubuntuone.lo
  CCLD   libubuntuone.la
  CC     test_gsd_ubuntuone-test-gsd-ubuntuone.o
  CC     test_gsd_ubuntuone-gsd-ubuntuone.o
  CCLD   test-gsd-ubuntuone
LC_ALL=C /usr/bin/intltool-merge -d -u -c ../po/.intltool-merge-cache ../po ubuntuone.gnome-settings-plugin.in ubuntuone.gnome-settings-plugin
Found cached translation database
Merging translations into ubuntuone.gnome-settings-plugin.
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/gsd-plugin'
Making check in docs
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
Making check in reference
make[2]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs/reference'
make[2]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs/reference'
make[2]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
make[2]: Nothing to be done for `check-am'.
make[2]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/docs'
make[1]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk'
if test "x." != "x."; then \
		/bin/mkdir -p ubuntuone; \
		/bin/mkdir -p tests; \
		(cd ubuntuone && /usr/bin/lndir ./../ubuntuone > /dev/null); \
		(cd tests && /usr/bin/lndir ./../tests > /dev/null); \
	fi
sed -e 's|\@localedir\@|/usr/local/share/locale|g' \
	-e 's|\@libexecdir\@|/usr/local/libexec|g' \
	-e 's|\@GETTEXT_PACKAGE\@|ubuntuone-client|g' \
	-e 's|\@SSO_APP_NAME\@|Ubuntu One|g' \
	-e 's|\@SSO_TC_URL\@|https://one.ubuntu.com/terms/|g' \
	-e 's|\@SSO_PING_URL\@|https://one.ubuntu.com/oauth/sso-finished-so-get-tokens/|g' \
	-e 's|\@VERSION\@|1.5.4|g' < ubuntuone/clientdefs.py.in > ubuntuone/clientdefs.py
if test "x." != "x."; then \
		if [ ! -e pylintrc -a ! -h pylintrc ]; then \
			ln -s ./pylintrc; \
		fi; \
	fi
make -C data logging.conf
make[2]: Entering directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
make[2]: `logging.conf' is up to date.
make[2]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk/data'
make[1]: Leaving directory `/var/cache/tarmac/ubuntuone-client/trunk'
if test "x." != "x."; then \
		if [ ! -e pylintrc -a ! -h pylintrc ]; then \
			ln -s ./pylintrc; \
		fi; \
	fi
PYTHONPATH=""::.:."" SRCDIR="." USE_PYFLAKES="true" u1lint
== Python Lint Notices ==

./ubuntuone/status/aggregator.py:
    33:  'open_volumes' imported but unused

configure.ac:14: installing `./config.guess'
configure.ac:14: installing `./config.sub'
configure.ac:7: installing `./install-sh'
configure.ac:7: installing `./missing'
gsd-plugin/Makefile.am: installing `./depcomp'
syncdaemon-authentication.h:55: Warning: Syncdaemon: syncdaemon_authentication_find_credentials: return value: Missing (transfer) annotation
syncdaemon-interface.c:192: Warning: Syncdaemon: syncdaemon_interface_setup_proxy: return value: Missing (transfer) annotation
syncdaemon-interface.c:252: Warning: Syncdaemon: syncdaemon_interface_get_proxy_object: return value: Missing (transfer) annotation
syncdaemon-daemon.h:97: Warning: Syncdaemon: syncdaemon_daemon_get_authentication: return value: Missing (transfer) annotation
syncdaemon-daemon.c:841: Warning: Syncdaemon: syncdaemon_daemon_get_metadata: return value: Missing (transfer) annotation
syncdaemon-daemon.c:866: Warning: Syncdaemon: syncdaemon_daemon_get_folders: return value: Missing (transfer) annotation
syncdaemon-daemon.c:891: Warning: Syncdaemon: syncdaemon_daemon_get_folder_info: return value: Missing (transfer) annotation
syncdaemon-daemon.c:1159: Warning: Syncdaemon: syncdaemon_daemon_get_public_files: return value: Missing (transfer) annotation
syncdaemon-daemon.c:1245: Warning: Syncdaemon: syncdaemon_daemon_get_shared_folders: return value: Missing (transfer) annotation
syncdaemon-daemon.c:1268: Warning: Syncdaemon: syncdaemon_daemon_get_shares: return value: Missing (transfer) annotation
syncdaemon-daemon.c:1291: Warning: Syncdaemon: syncdaemon_daemon_get_current_status: return value: Missing (transfer) annotation
syncdaemon-daemon.c:1315: Warning: Syncdaemon: syncdaemon_daemon_get_current_downloads: return value: Missing (transfer) annotation
syncdaemon-daemon.c:1340: Warning: Syncdaemon: syncdaemon_daemon_get_current_uploads: return value: Missing (transfer) annotation
syncdaemon-daemon.h:149: Warning: Syncdaemon: syncdaemon_daemon_get_config_interface: return value: Missing (transfer) annotation
syncdaemon-daemon.h:150: Warning: Syncdaemon: syncdaemon_daemon_get_events_interface: return value: Missing (transfer) annotation
syncdaemon-daemon.h:151: Warning: Syncdaemon: syncdaemon_daemon_get_filesystem_interface: return value: Missing (transfer) annotation
syncdaemon-daemon.h:152: Warning: Syncdaemon: syncdaemon_daemon_get_folders_interface: return value: Missing (transfer) annotation
syncdaemon-daemon.h:153: Warning: Syncdaemon: syncdaemon_daemon_get_publicfiles_interface: return value: Missing (transfer) annotation
syncdaemon-daemon.h:154: Warning: Syncdaemon: syncdaemon_daemon_get_shares_interface: return value: Missing (transfer) annotation
syncdaemon-daemon.h:155: Warning: Syncdaemon: syncdaemon_daemon_get_status_interface: return value: Missing (transfer) annotation
syncdaemon-filesystem-interface.h:53: Warning: Syncdaemon: syncdaemon_filesystem_interface_get_metadata: return value: Missing (transfer) annotation
syncdaemon-filesystem-interface.h:62: Warning: Syncdaemon: syncdaemon_filesystem_interface_get_metadata_async: argument callback: Missing (scope) annotation for callback without GDestroyNotify (valid: call, async)
syncdaemon-folders-interface.c:338: Warning: Syncdaemon: syncdaemon_folders_interface_get_folders: return value: Missing (transfer) annotation
syncdaemon-folders-interface.c:401: Warning: Syncdaemon: syncdaemon_folders_interface_get_info: return value: Missing (transfer) annotation
syncdaemon-publicfiles-interface.c:212: Warning: Syncdaemon: syncdaemon_publicfiles_interface_get_public_files: return value: Missing (transfer) annotation
syncdaemon-shares-interface.h:59: Warning: Syncdaemon: syncdaemon_shares_interface_get_shared: return value: Missing (transfer) annotation
syncdaemon-shares-interface.h:60: Warning: Syncdaemon: syncdaemon_shares_interface_get_shares: return value: Missing (transfer) annotation
syncdaemon-status-interface.c:285: Warning: Syncdaemon: syncdaemon_status_interface_get_current_status: return value: Missing (transfer) annotation
syncdaemon-status-interface.c:321: Warning: Syncdaemon: syncdaemon_status_interface_get_current_downloads: return value: Missing (transfer) annotation
syncdaemon-status-interface.c:380: Warning: Syncdaemon: syncdaemon_status_interface_get_current_uploads: return value: Missing (transfer) annotation
warning: failed to load external entity "../xml/annotation-glossary.xml"
Computing chunks...
Writing SyncdaemonMetadata.html for refentry(SyncdaemonMetadata)
Writing libsyncdaemon-SyncdaemonEvents.html for refentry(libsyncdaemon-SyncdaemonEvents)
Writing SyncdaemonFileInfo.html for refentry(SyncdaemonFileInfo)
Writing SyncdaemonTransferInfo.html for refentry(SyncdaemonTransferInfo)
Writing SyncdaemonShareInfo.html for refentry(SyncdaemonShareInfo)
Writing libsyncdaemon-SyncdaemonFilesystem.html for refentry(libsyncdaemon-SyncdaemonFilesystem)
Writing libsyncdaemon-SyncdaemonStatus.html for refentry(libsyncdaemon-SyncdaemonStatus)
Writing libsyncdaemon-SyncdaemonConfig.html for refentry(libsyncdaemon-SyncdaemonConfig)
Writing libsyncdaemon-SyncdaemonPublicfiles.html for refentry(libsyncdaemon-SyncdaemonPublicfiles)
Writing SyncdaemonAuthentication.html for refentry(SyncdaemonAuthentication)
Writing libsyncdaemon-SyncdaemonShares.html for refentry(libsyncdaemon-SyncdaemonShares)
Writing SyncdaemonCredentials.html for refentry(SyncdaemonCredentials)
Writing libsyncdaemon-SyncdaemonFolders.html for refentry(libsyncdaemon-SyncdaemonFolders)
Writing SyncdaemonDaemon.html for refentry(SyncdaemonDaemon)
Writing libsyncdaemon-Syncdaemon.html for refentry(libsyncdaemon-Syncdaemon)
Writing SyncdaemonFolderInfo.html for refentry(SyncdaemonFolderInfo)
Writing SyncdaemonStatusInfo.html for refentry(SyncdaemonStatusInfo)
Writing ch01.html for chapter
Writing object-tree.html for chapter(object-tree)
Writing api-index-full.html for index(api-index-full)
Writing index.html for book(index)
Writing index.sgml for book(index)
Writing libsyncdaemon.devhelp for book(index)
Writing libsyncdaemon.devhelp2 for book(index)
cp: cannot stat `./libsyncdaemon.pdf': No such file or directory
make[3]: [dist-hook] Error 1 (ignored)
mismatched quotes at line 1984 in ../tests/syncdaemon/test_action_queue.py
mismatched quotes at line 1623 in ../tests/syncdaemon/test_vm.py
mismatched quotes at line 1699 in ../tests/syncdaemon/test_vm.py
make: *** [lint] Error 1

Ubuntu One Client

Merge lp://staging/~thisfred/ubuntuone-client/fix-server-show into lp://staging/ubuntuone-client

Commit message

Description of the change

Preview Diff

Subscribers