[kdbus] KDBUS_ITEM_PAYLOAD_OFF items are (once again) relative to msg header

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

diff --git a/gio/gdbusprivate.h b/gio/gdbusprivate.h
index 651d4d6..094891e 100644 (file)
--- a/gio/gdbusprivate.h
+++ b/gio/gdbusprivate.h
@@ -13,20 +13,18 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
  *
  * Author: David Zeuthen <davidz@redhat.com>
  */
 
+#ifndef __G_DBUS_PRIVATE_H__
+#define __G_DBUS_PRIVATE_H__
+
 #if !defined (GIO_COMPILATION)
 #error "gdbusprivate.h is a private header file."
 #endif
 
-#ifndef __G_DBUS_PRIVATE_H__
-#define __G_DBUS_PRIVATE_H__
-
 #include <gio/giotypes.h>
 
 G_BEGIN_DECLS
@@ -35,16 +33,13 @@ G_BEGIN_DECLS
 
 typedef struct GDBusWorker GDBusWorker;
 
-typedef void (*GDBusWorkerMessageReceivedCallback) (GDBusWorker   *worker,
-                                                    GDBusMessage  *message,
+typedef void (*GDBusWorkerMessageReceivedCallback) (GDBusMessage  *message,
                                                     gpointer       user_data);
 
-typedef GDBusMessage *(*GDBusWorkerMessageAboutToBeSentCallback) (GDBusWorker   *worker,
-                                                                  GDBusMessage  *message,
+typedef GDBusMessage *(*GDBusWorkerMessageAboutToBeSentCallback) (GDBusMessage  *message,
                                                                   gpointer       user_data);
 
-typedef void (*GDBusWorkerDisconnectedCallback)    (GDBusWorker   *worker,
-                                                    gboolean       remote_peer_vanished,
+typedef void (*GDBusWorkerDisconnectedCallback)    (gboolean       remote_peer_vanished,
                                                     GError        *error,
                                                     gpointer       user_data);
 
@@ -76,6 +71,11 @@ gboolean     _g_dbus_worker_flush_sync   (GDBusWorker    *worker,
                                           GCancellable   *cancellable,
                                           GError        **error);
 
+/* can be called from any thread */
+void         _g_dbus_worker_close        (GDBusWorker         *worker,
+                                          GCancellable        *cancellable,
+                                          GSimpleAsyncResult  *result);
+
 /* ---------------------------------------------------------------------------------------------------- */
 
 void _g_dbus_initialize (void);
@@ -114,15 +114,16 @@ gchar *_g_dbus_enum_to_string (GType enum_type, gint value);
 
 /* ---------------------------------------------------------------------------------------------------- */
 
-GDBusMethodInvocation *_g_dbus_method_invocation_new (const gchar           *sender,
-                                                      const gchar           *object_path,
-                                                      const gchar           *interface_name,
-                                                      const gchar           *method_name,
-                                                      const GDBusMethodInfo *method_info,
-                                                      GDBusConnection       *connection,
-                                                      GDBusMessage          *message,
-                                                      GVariant              *parameters,
-                                                      gpointer               user_data);
+GDBusMethodInvocation *_g_dbus_method_invocation_new (const gchar             *sender,
+                                                      const gchar             *object_path,
+                                                      const gchar             *interface_name,
+                                                      const gchar             *method_name,
+                                                      const GDBusMethodInfo   *method_info,
+                                                      const GDBusPropertyInfo *property_info,
+                                                      GDBusConnection         *connection,
+                                                      GDBusMessage            *message,
+                                                      GVariant                *parameters,
+                                                      gpointer                 user_data);
 
 /* ---------------------------------------------------------------------------------------------------- */
 
@@ -138,6 +139,20 @@ void _g_dbus_object_proxy_add_interface (GDBusObjectProxy *proxy,
 void _g_dbus_object_proxy_remove_interface (GDBusObjectProxy *proxy,
                                             const gchar      *interface_name);
 
+/* Implemented in gdbusconnection.c */
+GDBusConnection *_g_bus_get_singleton_if_exists (GBusType bus_type);
+
+void g_dbus_message_init_header_iter (GDBusMessage   *message,
+                                      GHashTableIter *iter);
+
+GObject *
+g_dbus_address_get_stream_internal (const gchar   *address,
+                                    gboolean       kdbus_okay,
+                                    gchar        **out_uuid,
+                                    GCancellable  *cancellable,
+                                    GError       **error);
+
+
 G_END_DECLS
 
 #endif /* __G_DBUS_PRIVATE_H__ */