Merge branch 'master' of git+ssh://sandmann@people.freedesktop.org/home/sandmann/libnul

Conflicts:
	dbus.c

1 files changed, 5 insertions, 6 deletions

diff --git a/libnul.h b/libnul.h
index e65c7da..611559c 100644
--- a/libnul.h
+++ b/libnul.h
@@ -237,6 +237,11 @@ nul_dbus_parameter_t *nul_dbus_parameter_out   (const char    *name,
 						const nul_dbus_type_t *type);
 gboolean              nul_dbus_service_start   (nul_dbus_service_t *service);
 void                  nul_dbus_service_stop    (nul_dbus_service_t *service);
+void		      nul_dbus_service_set_callbacks (nul_dbus_service_t *service,
+						      const char *name,
+						      nul_dbus_function_t function,
+						      gpointer            data,
+						      ...);
 
 /* The returned values here are automatically freed at idle. You
  * must copy them if you want to keep them around
@@ -246,12 +251,6 @@ const nul_dbus_type_t * nul_dbus_type_uint32 (void);
 const nul_dbus_type_t * nul_dbus_type_string (void);
 
 /* Using a service */
-typedef struct nul_dbus_Proxy nul_dbus_Proxy;
-
-nul_dbus_Proxy *nul_dbus_proxy_new_session_service (const char *bus_name,
-						    const char *object,
-						    const char *interface);
-
 void nul_dbus_invoke (nul_dbus_service_t *service,
 		      const char *method_desc,
 		      nul_dbus_function_t callback,