|
Lines 506-512
connect_and_register(DBusConnection *con
Link Here
|
| 506 |
|
506 |
|
| 507 |
devices = libhal_find_device_by_capability(info->hal_ctx, "input", |
507 |
devices = libhal_find_device_by_capability(info->hal_ctx, "input", |
| 508 |
&num_devices, &error); |
508 |
&num_devices, &error); |
|
|
509 |
if (dbus_error_is_set(&error)) { |
| 509 |
/* FIXME: Get default devices if error is set. */ |
510 |
/* FIXME: Get default devices if error is set. */ |
|
|
511 |
LogMessage(X_ERROR, "config/hal: couldn't find input device: %s (%s)\n", |
| 512 |
error.name, error.message); |
| 513 |
goto out_ctx2; |
| 514 |
} |
| 510 |
for (i = 0; i < num_devices; i++) |
515 |
for (i = 0; i < num_devices; i++) |
| 511 |
device_added(info->hal_ctx, devices[i]); |
516 |
device_added(info->hal_ctx, devices[i]); |
| 512 |
libhal_free_string_array(devices); |
517 |
libhal_free_string_array(devices); |
|
Lines 516-525
connect_and_register(DBusConnection *con
Link Here
|
| 516 |
return TRUE; |
521 |
return TRUE; |
| 517 |
|
522 |
|
| 518 |
out_ctx2: |
523 |
out_ctx2: |
|
|
524 |
dbus_error_free(&error); |
| 519 |
if (!libhal_ctx_shutdown(info->hal_ctx, &error)) |
525 |
if (!libhal_ctx_shutdown(info->hal_ctx, &error)) |
| 520 |
LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", |
526 |
LogMessage(X_WARNING, "config/hal: couldn't shut down context: %s (%s)\n", |
| 521 |
error.name, error.message); |
527 |
error.name, error.message); |
| 522 |
out_ctx: |
528 |
out_ctx: |
|
|
529 |
dbus_error_free(&error); |
| 523 |
libhal_ctx_free(info->hal_ctx); |
530 |
libhal_ctx_free(info->hal_ctx); |
| 524 |
out_err: |
531 |
out_err: |
| 525 |
dbus_error_free(&error); |
532 |
dbus_error_free(&error); |
