From: Colin Walters <walters@verbum.org>
Date: Mon, 22 Feb 2010 14:48:45 +0000 (-0500)
Subject: Merge branch 'dbus-1.2'
X-Git-Tag: dbus-1.3.1~115
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e1c31c73074513d96fa22b5c0355107c42720597;p=thirdparty%2Fdbus.git

Merge branch 'dbus-1.2'

Conflicts:
	bus/bus.c
	bus/selinux.c
	configure.in
---

e1c31c73074513d96fa22b5c0355107c42720597
diff --cc bus/dir-watch-default.c
index ff70d080b,8e457eb6b..e7f8451b3
--- a/bus/dir-watch-default.c
+++ b/bus/dir-watch-default.c
@@@ -35,10 -35,6 +35,10 @@@ bus_watch_directory (const char *dir, B
  }
  
  void
- bus_watch_directory (const char *dir, BusContext *context)
+ bus_set_watched_dirs (BusContext *context, DBusList **directories)
  {
  }
 +
 +void bus_set_watched_dirs(BusContext *context, DBusList **dirs)
 +{
 +}