GDBus: Make message serialization routines take capabilities param

[platform/upstream/glib.git] / gio / gdbusprivate.c

diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 8f7ac8d..da06fe5 100644 (file)
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -1,6 +1,6 @@
 /* GDBus - GLib D-Bus Library
  *
- * Copyright (C) 2008-2009 Red Hat, Inc.
+ * Copyright (C) 2008-2010 Red Hat, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -25,8 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
-
 #ifdef G_OS_UNIX
 #include <gio/gunixconnection.h>
 #include <gio/gunixfdmessage.h>
@@ -35,10 +33,25 @@
 #endif
 
 #include "giotypes.h"
+#include "gsocket.h"
 #include "gdbusprivate.h"
 #include "gdbusmessage.h"
 #include "gdbuserror.h"
 #include "gdbusintrospection.h"
+#include "gasyncresult.h"
+#include "gsimpleasyncresult.h"
+#include "ginputstream.h"
+#include "giostream.h"
+#include "gsocketcontrolmessage.h"
+
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#include "gunixfdmessage.h"
+#include "gunixconnection.h"
+#endif
+
+#include "glibintl.h"
+#include "gioalias.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
@@ -570,6 +583,7 @@ _g_dbus_worker_do_read_cb (GInputStream  *input_stream,
 
           message = g_dbus_message_new_from_blob ((guchar *) worker->read_buffer,
                                                   worker->read_buffer_cur_size,
+                                                  worker->capabilities,
                                                   &error);
           if (message == NULL)
             {
@@ -1038,3 +1052,6 @@ _g_dbus_compute_complete_signature (GDBusArgInfo **args,
 
   return g_string_free (s, FALSE);
 }
+
+#define __G_DBUS_PRIVATE_C__
+#include "gioaliasdef.c"