components/library/gnome-vfs/patches/gnome-vfs-13-hal-crash.patch

   1 --- /usr/tmp/clean/gnome-vfs-2.20.1/libgnomevfs/gnome-vfs-hal-mounts.c  2007-11-12 08:36:48.000000000 +0000
   2 +++ gnome-vfs-2.20.1/libgnomevfs/gnome-vfs-hal-mounts.c 2007-11-23 10:49:55.844493000 +0000
   3 @@ -1469,8 +1469,12 @@
   4                                                  _hal_device_property_modified);
   5
   6         if (!libhal_ctx_init (volume_monitor_daemon->hal_ctx, &error)) {
   7 -               g_warning ("libhal_ctx_init failed: %s\n", error.message);
   8 -               dbus_error_free (&error);
   9 +               if (dbus_error_is_set (&error)) {
  10 +                       g_warning ("libhal_ctx_init failed: %s\n", error.message);
  11 +                       dbus_error_free (&error);
  12 +               } else {
  13 +                       g_warning ("libhal_ctx_init failed but dbus error is not set\n");
  14 +               }
  15                 return FALSE;
  16         }
  17
  18 @@ -1499,8 +1503,12 @@
  19
  20         dbus_error_init (&error);
  21         if (!libhal_ctx_shutdown (volume_monitor_daemon->hal_ctx, &error)) {
  22 -               g_warning ("hal_shutdown failed: %s\n", error.message);
  23 -               dbus_error_free (&error);
  24 +               if (dbus_error_is_set (&error)) {
  25 +                       g_warning ("hal_shutdown failed: %s\n", error.message);
  26 +                       dbus_error_free (&error);
  27 +               } else {
  28 +                       g_warning ("hal_shutdown failed but dbus error is not set\n");
  29 +               }
  30                 return;
  31         }
  32