Merge branch 'dbus-1.2'

Conflicts:
	bus/main.c
	configure.in

3 files changed, 2 insertions, 10 deletions

diff --git a/bus/dir-watch-kqueue.c b/bus/dir-watch-kqueue.c
index 4a01b748..4e436eb1 100644
--- a/bus/dir-watch-kqueue.c
+++ b/bus/dir-watch-kqueue.c
@@ -169,7 +169,7 @@ bus_set_watched_dirs (BusContext *context, DBusList **directories)
    */
   for (i = 0; new_dirs[i]; i++)
     {
-      for (j = 0; i < num_fds; j++)
+      for (j = 0; j < num_fds; j++)
         {
           if (dirs[j] && strcmp (new_dirs[i], dirs[j]) == 0)
             {
diff --git a/bus/main.c b/bus/main.c
index 24bc905e..ab174521 100644
--- a/bus/main.c
+++ b/bus/main.c
@@ -69,11 +69,6 @@ signal_handler (int sig)
       }
       break;
 #endif
-#ifdef SIGTERM
-    case SIGTERM:
-      _dbus_loop_quit (bus_context_get_loop (context));
-      break;
-#endif
     }
 }
 
@@ -478,9 +473,6 @@ main (int argc, char **argv)
 #ifdef SIGHUP
   _dbus_set_signal_handler (SIGHUP, signal_handler);
 #endif
-#ifdef SIGTERM
-  _dbus_set_signal_handler (SIGTERM, signal_handler);
-#endif
 #ifdef DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX 
   _dbus_set_signal_handler (SIGIO, signal_handler);
 #endif /* DBUS_BUS_ENABLE_DNOTIFY_ON_LINUX */
diff --git a/bus/rc.messagebus.in b/bus/rc.messagebus.in
index b147503d..c52ca777 100644
--- a/bus/rc.messagebus.in
+++ b/bus/rc.messagebus.in
@@ -61,7 +61,7 @@ case "$1" in
         stop
         ;;
     status)
-        status $processname
+        status $servicename
         RETVAL=$?
         ;;
     restart)