From: John (J5) Palmieri <johnp@redhat.com>
Date: Thu, 19 Oct 2006 19:43:05 +0000 (+0000)
Subject: * bus/dir-watch-default.c, bus/dir-watch-dnotify.c,
X-Git-Tag: dbus-0.95~41
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe1f793a4f8296fb00d409a4a52b12ed7526caac;p=thirdparty%2Fdbus.git

* bus/dir-watch-default.c, bus/dir-watch-dnotify.c,
  bus/dir-watch-kqueue.c (bus_watch_directory): Pass in a BusContext
  instead of a void *.  kqueue uses this to get the context's loop
  while the other modules ignore the parameter.  This allows us to
  avoid platform conditionals

* bus/bus.c (process_config_postinit): Pass in the context to the
  watch
---

diff --git a/ChangeLog b/ChangeLog
index 6fd64702f..822cb860d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-19  John (J5) Palmieri  <johnp@redhat.com>
+
+	* bus/dir-watch-default.c, bus/dir-watch-dnotify.c, 
+	bus/dir-watch-kqueue.c (bus_watch_directory): Pass in a BusContext 
+	instead of a void *.  kqueue uses this to get the context's loop
+	while the other modules ignore the parameter.  This allows us to
+	avoid platform conditionals
+
+	* bus/bus.c (process_config_postinit): Pass in the context to the 
+	watch
+
 2006-10-19  John (J5) Palmieri  <johnp@redhat.com>
 
 	* bus/messagebus.in, bus/rc.messagebus.in: run dbus-uuidgen --ensure
diff --git a/bus/dir-watch-default.c b/bus/dir-watch-default.c
index 5dc159cab..b73c61752 100644
--- a/bus/dir-watch-default.c
+++ b/bus/dir-watch-default.c
@@ -35,6 +35,6 @@ bus_drop_all_directory_watches (void)
 }
 
 void
-bus_watch_directory (const char *dir, void *userdata)
+bus_watch_directory (const char *dir, BusContext *context)
 {
 }
diff --git a/bus/dir-watch-dnotify.c b/bus/dir-watch-dnotify.c
index 87e327617..988ef384e 100644
--- a/bus/dir-watch-dnotify.c
+++ b/bus/dir-watch-dnotify.c
@@ -38,7 +38,7 @@ static int fds[MAX_DIRS_TO_WATCH];
 static int num_fds = 0;
 
 void
-bus_watch_directory (const char *dir, void *userdata)
+bus_watch_directory (const char *dir, BusContext *context)
 {
   int fd;
 
diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
index b08fd39f9..52f00102d 100644
--- a/bus/dir-watch-kqueue.c
+++ b/bus/dir-watch-kqueue.c
@@ -87,7 +87,7 @@ _handle_kqueue_watch (DBusWatch *watch, unsigned int flags, void *data)
 }
 
 void
-bus_watch_directory (const char *dir, void *userdata)
+bus_watch_directory (const char *dir, BusContext *context)
 {
   int fd;
   struct kevent ev;
@@ -104,7 +104,7 @@ bus_watch_directory (const char *dir, void *userdata)
 	  goto out;
 	}
 
-        loop = userdata;
+        loop = bus_context_get_loop (context);
 
         watch = _dbus_watch_new (kq, DBUS_WATCH_READABLE, TRUE,
                                  _handle_kqueue_watch, NULL, NULL);
diff --git a/bus/dir-watch.h b/bus/dir-watch.h
index 3b7542612..263ee035e 100644
--- a/bus/dir-watch.h
+++ b/bus/dir-watch.h
@@ -21,11 +21,13 @@
  *
  */
 
+#include "bus.h"
+
 #ifndef DIR_WATCH_H
 #define DIR_WATCH_H
 
 /* setup a watch on a directory (OS dependent, may be a NOP) */
-void bus_watch_directory (const char *directory, void *userdata);
+void bus_watch_directory (const char *directory, BusContext *context);
 
 /* drop all the watches previously set up by bus_config_watch_directory (OS dependent, may be a NOP) */
 void bus_drop_all_directory_watches (void);