Merge lp:~laney/ubuntuone-client-gnome/glib-single-include into lp:ubuntuone-client-gnome

Proposed by Iain Lane on 2012-06-01
Status: Merged
Approved by: dobey on 2012-06-01
Approved revision: 19
Merged at revision: 18
Proposed branch: lp:~laney/ubuntuone-client-gnome/glib-single-include
Merge into: lp:ubuntuone-client-gnome
Diff against target: 13 lines (+1/-2)
1 file modified
nautilus/utils.c (+1/-2)
To merge this branch: bzr merge lp:~laney/ubuntuone-client-gnome/glib-single-include
Reviewer Review Type Date Requested Status
Iain Lane (community) Abstain on 2012-06-01
dobey (community) 2012-06-01 Approve on 2012-06-01
Review via email: mp+108379@code.launchpad.net

Commit message

Include glib.h directly since including individual headers is no longer supported.

Description of the change

Only glib.h can be included now, not individual headers.

To post a comment you must log in.
dobey (dobey) :
review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (20.8 KiB)

The attempt to merge lp:~laney/ubuntuone-client-gnome/glib-single-include into lp:ubuntuone-client-gnome 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.69
checking for automake >= 1.10...
  testing automake-1.11... found 1.11.5
checking for libtool >= 1.5...
  testing libtoolize... found 2.4.2
checking for intltool >= 0.30...
  testing intltoolize... found 0.50.2
checking for pkg-config >= 0.14.0...
  testing pkg-config... found 0.26
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 aclocal-1.11...
Running autoconf...
Running autoheader...
Running automake-1.11...
Running ./configure --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 whether make supports nested variables... 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... x86_64-unknown-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking how to print strings... printf
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 how to convert x86_64-unknown-linux-gnu file names to x86_64-unknown-linux-gnu fo...

dobey (dobey) wrote :

Actually, the g18n.h include needs to remain, as glib.h does not include it or gi18n-lib.h automatically, as they conflict.

review: Needs Fixing
19. By Iain Lane on 2012-06-01

Single include doesn't apply to gi18n.h; this must be included explicitly

Iain Lane (laney) wrote :

Saw that and pushed it. Sorry for missing initially, and thanks.

review: Resubmit
dobey (dobey) :
review: Approve
Iain Lane (laney) :
review: Abstain

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nautilus/utils.c'
2--- nautilus/utils.c 2012-04-16 19:31:53 +0000
3+++ nautilus/utils.c 2012-06-01 17:39:18 +0000
4@@ -27,8 +27,7 @@
5 #include <limits.h>
6 #include <stdlib.h>
7 #include <glib/gi18n.h>
8-#include <glib/gutils.h>
9-#include <glib/gfileutils.h>
10+#include <glib.h>
11 #include <libnautilus-extension/nautilus-file-info.h>
12 #include <libsyncdaemon/libsyncdaemon.h>
13 #include "ubuntuone-nautilus.h"

Subscribers

People subscribed via source and target branches

to all changes: