diff options
| author | Bastien Nocera <hadess@hadess.net> | 2006-05-25 13:49:30 +0000 |
|---|---|---|
| committer | Bastien Nocera <hadess@src.gnome.org> | 2006-05-25 13:49:30 +0000 |
| commit | 16f66aca3f85b29ed573a654fbfb1e68d3b285cd (patch) | |
| tree | 65b35d9e5ed22d27c70b7aab18cac733bee3b68e /src | |
| parent | df8d0d0ccf9772fae260ef6355fbf4a0ac9d3eb9 (diff) | |
Fix build and run-time with HAL >= 0.5
2006-05-25 Bastien Nocera <hadess@hadess.net>
* src/plparse/totem-disc.c: (cd_cache_new_hal_ctx),
(cd_cache_has_medium): Fix build and run-time with HAL >= 0.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/plparse/totem-disc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plparse/totem-disc.c b/src/plparse/totem-disc.c index 1f1a4937..5da75319 100644 --- a/src/plparse/totem-disc.c +++ b/src/plparse/totem-disc.c @@ -261,6 +261,8 @@ cd_cache_new_hal_ctx (void) ctx = libhal_ctx_new (); if (ctx == NULL) return NULL; + + dbus_error_init (&error); conn = dbus_bus_get (DBUS_BUS_SYSTEM, &error); if (conn != NULL && !dbus_error_is_set (&error)) { libhal_ctx_set_dbus_connection (ctx, conn); @@ -272,6 +274,8 @@ cd_cache_new_hal_ctx (void) libhal_ctx_shutdown (ctx, NULL); libhal_ctx_free(ctx); + + return NULL; } #endif @@ -370,7 +374,7 @@ cd_cache_has_medium (CdCache *cache) if (devices != NULL && num_devices >= 1) retval = TRUE; - libhal_free_string_array (device_names); + libhal_free_string_array (devices); g_free (udi); return retval; |