On 14 May 2010 04:38, Matthias Clasen <matthias.cla...@gmail.com> wrote: > I've now merged the gdbus-merge branch to master. > Thanks to everybody who tried it out and provided feedback.
I've built this and found some problems when building applications that link to gio, but not gio-unix (GConf for example). The problem is that #include <gio/gunixcredentialsmessage.h> was added to gio.h. The attached patch fixes things up for me, and makes things work (tm). Please review the attached patch, thanks. Richard.
From b7dfe9bb7ca972662a3a4c1b863da8cf694c6c30 Mon Sep 17 00:00:00 2001 From: Richard Hughes <rich...@hughsie.com> Date: Fri, 14 May 2010 09:49:22 +0100 Subject: [PATCH] Do not include UNIX specific headers in gio.h --- gio/gdbusprivate.c | 1 + gio/gio.h | 1 - gio/gunixconnection.c | 1 + 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c index da06fe5..b2b2493 100644 --- a/gio/gdbusprivate.c +++ b/gio/gdbusprivate.c @@ -48,6 +48,7 @@ #include <unistd.h> #include "gunixfdmessage.h" #include "gunixconnection.h" +#include "gunixcredentialsmessage.h" #endif #include "glibintl.h" diff --git a/gio/gio.h b/gio/gio.h index ca55cd6..dd5c811 100644 --- a/gio/gio.h +++ b/gio/gio.h @@ -110,7 +110,6 @@ #include <gio/gdbusmethodinvocation.h> #include <gio/gdbusserver.h> #include <gio/gcredentials.h> -#include <gio/gunixcredentialsmessage.h> #include <gio/gdbusauthobserver.h> #undef __GIO_GIO_H_INSIDE__ diff --git a/gio/gunixconnection.c b/gio/gunixconnection.c index 3921c92..fb3d9ae 100644 --- a/gio/gunixconnection.c +++ b/gio/gunixconnection.c @@ -15,6 +15,7 @@ #include "config.h" #include "gunixconnection.h" #include "glibintl.h" +#include "gunixcredentialsmessage.h" /** * SECTION: gunixconnection -- 1.7.0.1
_______________________________________________ gtk-devel-list mailing list gtk-devel-list@gnome.org http://mail.gnome.org/mailman/listinfo/gtk-devel-list