dbus/dbus dbus-glib.h,1.10,1.11

[Colin Walters]

Update of /cvs/dbus/dbus/dbus
In directory gabe:/tmp/cvs-serv6984/dbus

Modified Files:
	dbus-glib.h 
Log Message:
2005-06-14  Ross Burton <ross at burtonini.com>.

	* glib/dbus-glib.h: Make DBusGMethodInvocation
	a private structure.  Rearrange prototypes a bit.
	
	* glib/dbus-gproxy.c (dbus_g_proxy_invoke): Add
	documentation for first_arg_type.
	
	* glib/dbus-gobject.c: Move DBusGMethodInvocation
	here, add documentation.  Move dbus_g_method_return
	and dbus_g_method_return_error into public API
	section.


Index: dbus-glib.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-glib.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- dbus-glib.h	13 Jun 2005 03:01:28 -0000	1.10
+++ dbus-glib.h	14 Jun 2005 15:52:41 -0000	1.11
@@ -267,22 +267,18 @@
 						      GType              first_arg_type,
 						      ...);
 
+typedef struct DBusGMethodInvocation DBusGMethodInvocation;
+
+void dbus_g_method_return (DBusGMethodInvocation *context, ...);
+
+void dbus_g_method_return_error (DBusGMethodInvocation *context, GError *error);
+
 typedef struct {
   DBusGProxy *proxy;
   gpointer cb;
   gpointer userdata;
 } DBusGAsyncData;
 
-typedef struct {
-  DBusGConnection *connection;
-  DBusGMessage *message;
-  const DBusGObjectInfo *object;
-  const DBusGMethodInfo *method;
-} DBusGMethodInvocation;
-
-void dbus_g_method_return (DBusGMethodInvocation *context, ...);
-void dbus_g_method_return_error (DBusGMethodInvocation *context, GError *error);
-
 #undef DBUS_INSIDE_DBUS_GLIB_H
 
 G_END_DECLS