Merge lp:~dobey/ubuntuone-client-gnome/update-stable-4-0 into lp:ubuntuone-client-gnome/stable-4-0

Proposed by dobey on 2012-06-04
Status: Merged
Approved by: dobey on 2012-06-04
Approved revision: 17
Merged at revision: 17
Proposed branch: lp:~dobey/ubuntuone-client-gnome/update-stable-4-0
Merge into: lp:ubuntuone-client-gnome/stable-4-0
Diff against target: 13 lines (+1/-2)
1 file modified
nautilus/utils.c (+1/-2)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client-gnome/update-stable-4-0
Reviewer Review Type Date Requested Status
Roberto Alsina (community) 2012-06-04 Approve on 2012-06-04
Review via email: mp+108638@code.launchpad.net

Commit Message

[Iain Lane]

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

To post a comment you must log in.
Roberto Alsina (ralsina) :
review: Approve

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-04 21:03:21 +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: