|
Lines 1430-1454
Link Here
|
| 1430 |
|
1430 |
|
| 1431 |
/* Setup DBus */ |
1431 |
/* Setup DBus */ |
| 1432 |
ivm_dbus_init(); |
1432 |
ivm_dbus_init(); |
| 1433 |
if (dbus_connection != NULL) { |
|
|
| 1434 |
/* If Hal is around */ |
| 1435 |
if ((ivm_dbus_get_name_owner("org.freedesktop.Hal"))) |
| 1436 |
hal_init(); |
| 1437 |
} else { |
| 1438 |
/* Try connecting to dbus */ |
| 1439 |
do { |
| 1440 |
g_usleep (G_USEC_PER_SEC * 3); |
| 1441 |
ivm_dbus_init(); |
| 1442 |
} while (dbus_connection == NULL); |
| 1443 |
} |
| 1444 |
|
| 1445 |
DEBUG("%s, http:/ivman.sourceforge.net\n", PACKAGE_STRING); |
| 1446 |
|
| 1447 |
#ifdef HAL_0_4 |
| 1448 |
DEBUG(_("Compiled against HAL 0.4.x or earlier\n")); |
| 1449 |
#else |
| 1450 |
DEBUG(_("Compiled against HAL 0.5.x or later\n")); |
| 1451 |
#endif |
| 1452 |
|
1433 |
|
| 1453 |
if ( !usermode ) { |
1434 |
if ( !usermode ) { |
| 1454 |
DEBUG(_("Running in system mode.\n")); |
1435 |
DEBUG(_("Running in system mode.\n")); |
|
Lines 1475-1480
Link Here
|
| 1475 |
cfg_base->user, cfg_base->group); |
1456 |
cfg_base->user, cfg_base->group); |
| 1476 |
return 1; |
1457 |
return 1; |
| 1477 |
} |
1458 |
} |
|
|
1459 |
|
| 1460 |
if (dbus_connection != NULL) { |
| 1461 |
/* If Hal is around */ |
| 1462 |
if ((ivm_dbus_get_name_owner("org.freedesktop.Hal"))) |
| 1463 |
hal_init(); |
| 1464 |
} else { |
| 1465 |
/* Try connecting to dbus */ |
| 1466 |
do { |
| 1467 |
g_usleep (G_USEC_PER_SEC * 3); |
| 1468 |
ivm_dbus_init(); |
| 1469 |
} while (dbus_connection == NULL); |
| 1470 |
} |
| 1471 |
|
| 1472 |
DEBUG("%s, http:/ivman.sourceforge.net\n", PACKAGE_STRING); |
| 1473 |
|
| 1474 |
#ifdef HAL_0_4 |
| 1475 |
DEBUG(_("Compiled against HAL 0.4.x or earlier\n")); |
| 1476 |
#else |
| 1477 |
DEBUG(_("Compiled against HAL 0.5.x or later\n")); |
| 1478 |
#endif |
| 1478 |
|
1479 |
|
| 1479 |
loop = g_main_loop_new(NULL, FALSE); |
1480 |
loop = g_main_loop_new(NULL, FALSE); |
| 1480 |
if ( !loop ) { |
1481 |
if ( !loop ) { |
