applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

do proper dbus/libhal error handling. (Closes #363005)

Browse source 
2007-01-07  Jan Arne Petersen  <jap@gnome.org>

	* sound-properties-capplet.c: (setup_hal_devices): do proper
	dbus/libhal error handling. (Closes #363005)


svn path=/trunk/; revision=7053
This commit is contained in:
Jan Arne Petersen 2007-01-06 18:41:13 +00:00 • committed by Jan Arne Petersen
parent 984d6f99bc
commit d2e2e99b8e
2 changed files with 33 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
capplets/sound/ChangeLog
View file

@ -1,3 +1,8 @@
2007-01-07 Jan Arne Petersen <jap@gnome.org>
* sound-properties-capplet.c: (setup_hal_devices): do proper
dbus/libhal error handling. (Closes #363005)
2007-01-06 Gabor Kelemen <kelemeng@gnome.hu>
Fixes #393472

36
capplets/sound/sound-properties-capplet.c
View file

@ -454,12 +454,19 @@ setup_hal_devices ()
DBusError error;
LibHalContext *ctx;
char **devices;
int i, num;
int i, num = 0;
dbus_error_init (&error);
connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
g_return_if_fail (connection != NULL);
if (connection == NULL) {
/* cannot get a dbus connection */
if (dbus_error_is_set (&error)) {
g_warning ("Getting a system dbus connection an error occured: %s", error.message);
dbus_error_free (&error);
}
return;
}
dbus_connection_setup_with_g_main (connection, g_main_context_default ());
@ -470,17 +477,30 @@ setup_hal_devices ()
libhal_ctx_set_device_removed (ctx, device_removed_callback);
libhal_ctx_set_dbus_connection (ctx, connection);
libhal_ctx_init (ctx, &error);
if (!libhal_ctx_init (ctx, &error)) {
/* cannot connect to hald */
if (dbus_error_is_set (&error)) {
g_warning ("Connecting to hald an error occured: %s", error.message);
dbus_error_free (&error);
}
return;
}
devices = libhal_find_device_by_capability (ctx, "alsa", &num, &error);
if (devices == NULL) {
/* error in the libhal_find_device_by_capability function */
if (dbus_error_is_set (&error)) {
g_warning ("Calling a hal function an error occured: %s", error.message);
dbus_error_free (&error);
}
return;
}
for (i = 0; i < num; i++) {
device_added_callback (ctx, devices[i]);
}
dbus_free_string_array (devices);
dbus_error_free (&error);
}
#endif