dbus/glib dbus-gmain.c, 1.27, 1.28 dbus-gproxy.c, 1.9, 1.10 test-dbus-glib.c, 1.10, NONE test-profile.c, 1.4, NONE test-thread-client.c, 1.6, NONE test-thread-server.c, 1.5, NONE test-thread.h, 1.1, NONE

Kristian Hogsberg krh at pdx.freedesktop.org
Wed Jun 2 06:13:16 PDT 2004


Update of /cvs/dbus/dbus/glib
In directory pdx:/tmp/cvs-serv14383/glib

Modified Files:
	dbus-gmain.c dbus-gproxy.c 
Removed Files:
	test-dbus-glib.c test-profile.c test-thread-client.c 
	test-thread-server.c test-thread.h 
Log Message:
2004-06-02  Kristian Høgsberg  <krh at redhat.com>

	* glib/dbus-gproxy.c, glib/dbus-gmain.c, dbus/dbus-string.c,
	dbus/dbus-object-tree.c, dbus/dbus-message.c: add comments to
	quiet doxygen.

	* Doxyfile.in: remove deprecated options.

	* dbus/dbus-message-handler.c, dbus/dbus-message-handler.h,
	glib/test-thread.h, glib/test-thread-client.c,
	glib/test-thread-server.c, glib/test-profile.c,
	glib/test-dbus-glib.c: remove these unused files.


Index: dbus-gmain.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gmain.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- a/dbus-gmain.c	2 Dec 2003 10:44:21 -0000	1.27
+++ b/dbus-gmain.c	2 Jun 2004 13:13:14 -0000	1.28
@@ -67,14 +67,18 @@
   void *connection_or_server; /**< DBusConnection or DBusServer */
 };
 
+/**
+ * Auxillary struct for pairing up a #DBusWatch and associated
+ * #GPollFD
+ */
 typedef struct
 {
-  int refcount;
+  int refcount;     /**< reference count */
 
-  GPollFD poll_fd;
-  DBusWatch *watch;
+  GPollFD poll_fd;  /**< the #GPollFD to use with g_source_add_poll() */
+  DBusWatch *watch; /**< the corresponding DBusWatch*/
   
-  unsigned int removed : 1;
+  unsigned int removed : 1; /**< true if this #WatchFD has been removed */
 } WatchFD;
 
 static WatchFD *

Index: dbus-gproxy.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gproxy.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- a/dbus-gproxy.c	15 Apr 2004 22:08:04 -0000	1.9
+++ b/dbus-gproxy.c	2 Jun 2004 13:13:14 -0000	1.10
@@ -29,6 +29,10 @@
  * @{
  */
 
+/**
+ * DBusGProxyManager typedef
+ */
+
 typedef struct DBusGProxyManager DBusGProxyManager;
 
 /**
@@ -49,7 +53,7 @@
  */
 struct DBusGProxyClass
 {
-  GObjectClass parent_class;  
+  GObjectClass parent_class;  /**< Parent class */
 };
 
 static void dbus_gproxy_init          (DBusGProxy      *proxy);
@@ -62,12 +66,12 @@
 
 
 /**
- * A list of proxies with a given service+path+interface, used to route incoming
- * signals.
+ * A list of proxies with a given service+path+interface, used to
+ * route incoming signals.
  */
 typedef struct
 {
-  GSList *proxies;
+  GSList *proxies; /**< The list of proxies */
 
   char name[4]; /**< service (empty string for none), nul byte,
                  *   path, nul byte,
@@ -1256,6 +1260,17 @@
     g_error ("Out of memory\n");
 }
 
+/**
+ * Connect a signal handler to a proxy for a remote interface.  When
+ * the remote interface emits the specified signal, the proxy will
+ * emit a corresponding GLib signal.
+ *
+ * @param proxy a proxy for a remote interface
+ * @param signal_name the DBus signal name to listen for
+ * @param handler the handler to connect
+ * @param data data to pass to handler
+ * @param free_data_func callback function to destroy data
+ */
 void
 dbus_gproxy_connect_signal (DBusGProxy             *proxy,
                             const char             *signal_name,
@@ -1281,6 +1296,15 @@
   g_free (detail);
 }
 
+/**
+ * Disconnect all signal handlers from a proxy that match the given
+ * criteria.
+ *
+ * @param proxy a proxy for a remote interface
+ * @param signal_name the DBus signal name to disconnect
+ * @param handler the handler to disconnect
+ * @param data the data that was registered with handler
+ */
 void
 dbus_gproxy_disconnect_signal (DBusGProxy             *proxy,
                                const char             *signal_name,

--- test-dbus-glib.c DELETED ---

--- test-profile.c DELETED ---

--- test-thread-client.c DELETED ---

--- test-thread-server.c DELETED ---

--- test-thread.h DELETED ---




More information about the dbus-commit mailing list