1 files changed, 8 insertions, 7 deletions

diff --git a/libnm/nm-object-private.h b/libnm/nm-object-private.h
index 8f72b120b7..0e5218450d 100644
--- a/libnm/nm-object-private.h
+++ b/libnm/nm-object-private.h
@@ -24,9 +24,9 @@
 #include <gio/gio.h>
 #include "nm-object.h"
 
-typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GValue *, gpointer);
+typedef gboolean (*PropertyMarshalFunc) (NMObject *, GParamSpec *, GVariant *, gpointer);
 
-typedef GObject * (*NMObjectCreatorFunc) (DBusGConnection *, const char *);
+typedef GObject * (*NMObjectCreatorFunc) (GDBusConnection *, const char *);
 
 typedef struct {
 	const char *name;
@@ -36,14 +36,14 @@ typedef struct {
 	const char *signal_prefix;
 } NMPropertiesInfo;
 
-DBusGProxy *_nm_object_new_proxy (NMObject *self,
+GDBusProxy *_nm_object_new_proxy (NMObject *self,
                                   const char *path,
                                   const char *interface);
 
 gboolean _nm_object_is_connection_private (NMObject *self);
 
 void _nm_object_register_properties (NMObject *object,
-                                     DBusGProxy *proxy,
+                                     GDBusProxy *proxy,
                                      const NMPropertiesInfo *info);
 
 gboolean _nm_object_reload_properties (NMObject *object, GError **error);
@@ -68,7 +68,8 @@ void _nm_object_reload_property (NMObject *object,
 void _nm_object_set_property (NMObject *object,
                               const char *interface,
                               const char *prop_name,
-                              GValue *value);
+                              const char *format_string,
+                              ...);
 
 static inline const GPtrArray *
 handle_ptr_array_return (GPtrArray *array)
@@ -80,9 +81,9 @@ handle_ptr_array_return (GPtrArray *array)
 }
 
 /* object demarshalling support */
-typedef GType (*NMObjectTypeFunc) (DBusGConnection *, const char *);
+typedef GType (*NMObjectTypeFunc) (GDBusConnection *, const char *);
 typedef void (*NMObjectTypeCallbackFunc) (GType, gpointer);
-typedef void (*NMObjectTypeAsyncFunc) (DBusGConnection *, const char *, NMObjectTypeCallbackFunc, gpointer);
+typedef void (*NMObjectTypeAsyncFunc) (GDBusConnection *, const char *, NMObjectTypeCallbackFunc, gpointer);
 
 void _nm_object_register_type_func (GType base_type, NMObjectTypeFunc type_func,
                                     NMObjectTypeAsyncFunc type_async_func);