Attachment 108379 Details for Bug 226065

[patch] Extracted from upstream CVS

totem-plparser-rhythmbox-problem.diff (text/plain), 3.93 KB, created by Andreas Hanke on 2006-12-05 16:44:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Hanke

Created: 2006-12-05 16:44:29 UTC

Size: 3.93 KB

patch

obsolete

>diff -Naur /usr/src/packages/SOURCES/totem-2.17.0/src/plparse/totem-disc.c plparse/totem-disc.c
>--- /usr/src/packages/SOURCES/totem-2.17.0/src/plparse/totem-disc.c	2006-09-30 18:05:02.000000000 +0200
>+++ src/plparse/totem-disc.c	2006-11-27 18:51:29.000000000 +0100
>@@ -56,8 +56,6 @@
> 
> #ifdef HAVE_HAL
>   LibHalContext *ctx;
>-#endif
>-#ifdef HAVE_HAL_0_5
>   /* If the disc is a media, have the UDI available here */
>   char *disc_udi;
> #endif
>@@ -245,17 +243,7 @@
>   return found;
> }
> 
>-#ifdef HAVE_HAL_0_2
>-static LibHalContext *
>-cd_cache_new_hal_ctx (void)
>-{
>-  LibHalContext *ctx;
>-
>-  ctx = hal_initialize (NULL, FALSE);
>-
>-  return ctx;
>-}
>-#elif HAVE_HAL_0_5
>+#ifdef HAVE_HAL
> static LibHalContext *
> cd_cache_new_hal_ctx (void)
> {
>@@ -366,11 +354,11 @@
> static gboolean
> cd_cache_has_medium (CdCache *cache)
> {
>-  return FALSE;
>+  return TRUE;
> }
> #endif
> 
>-#ifdef HAVE_HAL_0_5
>+#ifdef HAVE_HAL
> static gboolean
> cd_cache_has_medium (CdCache *cache)
> {
>@@ -403,6 +391,12 @@
>   if (retval == FALSE) {
>     dbus_bool_t volume;
> 
>+    if (libhal_device_property_exists (cache->ctx,
>+	  udi, "volume.is_disc", NULL) == FALSE) {
>+      g_free (udi);
>+      return FALSE;
>+    }
>+
>     volume = libhal_device_get_property_bool (cache->ctx,
> 	udi, "volume.is_disc", &error);
>     if (dbus_error_is_set (&error)) {
>@@ -423,32 +417,6 @@
> 
>   return retval;
> }
>-#elif HAVE_HAL_0_2
>-static gboolean
>-cd_cache_has_medium (CdCache *cache)
>-{
>-  char **devices;
>-  int num_devices;
>-  char *udi;
>-  gboolean retval = FALSE;
>-
>-  if (cache->drive == NULL)
>-    return FALSE;
>- 
>-  udi = gnome_vfs_drive_get_hal_udi (cache->drive);
>-  if (udi == NULL)
>-    return FALSE;
>-
>-  devices = hal_manager_find_device_string_match (cache->ctx,
>-      "info.parent", udi, &num_devices);
>-  if (devices != NULL && num_devices >= 1)
>-    retval = TRUE;
>-
>-  hal_free_string_array (devices);
>-  g_free (udi);
>-
>-  return retval;
>-}
> #endif
> 
> static gboolean
>@@ -562,18 +530,16 @@
> 
> #ifdef HAVE_HAL
>   if (cache->ctx != NULL) {
>-#ifdef HAVE_HAL_0_5
>     DBusConnection *conn;
> 
>     conn = libhal_ctx_get_dbus_connection (cache->ctx);
>     libhal_ctx_shutdown (cache->ctx, NULL);
>     libhal_ctx_free(cache->ctx);
>+    /* Close the connection before doing the last unref */
>     dbus_connection_close (conn);
>+    dbus_connection_unref (conn);
> 
>     g_free (cache->disc_udi);
>-#elif HAVE_HAL_0_2
>-    hal_shutdown (cache->ctx);
>-#endif
>   }
> #endif /* HAVE_HAL */
> 
>@@ -597,7 +563,7 @@
>   if (!cd_cache_open_device (cache, error))
>     return MEDIA_TYPE_ERROR;
> 
>-#ifdef HAVE_HAL_0_5
>+#ifdef HAVE_HAL
>   {
>     DBusError error;
>     dbus_bool_t is_cdda;
>@@ -700,7 +666,7 @@
>     return MEDIA_TYPE_ERROR;
>   if (!cache->mountpoint)
>     return MEDIA_TYPE_ERROR;
>-#ifdef HAVE_HAL_0_5
>+#ifdef HAVE_HAL
>   if (cache->is_media != FALSE) {
>     DBusError error;
>     dbus_bool_t is_vcd;
>@@ -749,7 +715,7 @@
>     return MEDIA_TYPE_ERROR;
>   if (!cache->mountpoint)
>     return MEDIA_TYPE_ERROR;
>-#ifdef HAVE_HAL_0_5
>+#ifdef HAVE_HAL
>   if (cache->is_media != FALSE) {
>     DBusError error;
>     dbus_bool_t is_dvd;
>@@ -884,6 +850,21 @@
>   return totem_cd_detect_type_with_url (device, NULL, error);
> }
> 
>+gboolean
>+totem_cd_has_medium (const char  *device)
>+{
>+  CdCache *cache;
>+  gboolean retval = TRUE;
>+
>+  if (!(cache = cd_cache_new (device, NULL)))
>+    return TRUE;
>+
>+  retval = cd_cache_has_medium (cache);
>+  cd_cache_free (cache);
>+
>+  return retval;
>+}
>+
> const char *
> totem_cd_get_human_readable_name (MediaType type)
> {
>diff -Naur /usr/src/packages/SOURCES/totem-2.17.0/src/plparse/totem-disc.h plparse/totem-disc.h
>--- /usr/src/packages/SOURCES/totem-2.17.0/src/plparse/totem-disc.h	2005-09-24 21:15:09.000000000 +0200
>+++ src/plparse/totem-disc.h	2006-11-27 18:51:29.000000000 +0100
>@@ -44,6 +44,7 @@
> 					 GError    **error);
> const char *	totem_cd_get_human_readable_name (MediaType type);
> char *		totem_cd_mrl_from_type (const char *scheme, const char *dir);
>+gboolean	totem_cd_has_medium (const char  *device);
> 
> G_END_DECLS
>

Actions: View | Diff

Attachments on bug 226065: 108379 | 108442 | 108443