fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 04:08:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.2'

Browse source 
Conflicts:
	bus/main.c
	configure.in
This commit is contained in:
Will Thompson 2010-05-21 11:48:28 +01:00
commit 01ae2cb793
3 changed files with 2 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bus/dir-watch-kqueue.c
View file

@ -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)
{

8
bus/main.c
View file

@ -68,11 +68,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 */

2
bus/rc.messagebus.in
View file

@ -61,7 +61,7 @@ case "$1" in
stop
;;
status)
status $processname
status $servicename
RETVAL=$?
;;
restart)