components/gvfs/patches/gvfs-07-init-dbus-error.patch

   1 --- gvfs-1.4.3/monitor/hal/hal-device.c.orig    2009-11-27 22:13:48.000000000 +0800
   2 +++ gvfs-1.4.3/monitor/hal/hal-device.c 2010-01-11 16:13:35.423555462 +0800
   3 @@ -44,8 +44,11 @@
   4  static void
   5  hal_device_finalize (HalDevice *device)
   6  {
   7 +
   8 +  DBusError error;
   9 +  dbus_error_init(&error);
  10    libhal_device_remove_property_watch (device->priv->hal_ctx,
  11 -      device->priv->udi, NULL);
  12 +      device->priv->udi, &error);
  13
  14    if (device->priv->properties != NULL)
  15      libhal_free_property_set (device->priv->properties);
  16 @@ -53,6 +56,8 @@
  17
  18    if (G_OBJECT_CLASS (hal_device_parent_class)->finalize)
  19      (* G_OBJECT_CLASS (hal_device_parent_class)->finalize) (G_OBJECT (device));
  20 +
  21 +  dbus_error_free (&error);
  22  }
  23
  24  static void
  25 @@ -226,12 +231,18 @@
  26  {
  27    HalDevice *device;
  28
  29 -  libhal_device_add_property_watch (hal_ctx, udi, NULL);
  30 +  DBusError error;
  31 +  dbus_error_init (&error);
  32 +
  33 +  libhal_device_add_property_watch (hal_ctx, udi, &error);
  34
  35    device = HAL_DEVICE (g_object_new (HAL_TYPE_DEVICE, NULL));
  36    device->priv->udi = g_strdup (udi);
  37    device->priv->hal_ctx = hal_ctx;
  38    device->priv->properties = libhal_device_get_all_properties (hal_ctx, udi, NULL);
  39 +
  40 +  dbus_error_free (&error);
  41 +
  42    return device;
  43  }
  44
  45 @@ -241,13 +252,19 @@
  46                                          LibHalPropertySet *properties)
  47  {
  48    HalDevice *device;
  49 -
  50 -  libhal_device_add_property_watch (hal_ctx, udi, NULL);
  51 +
  52 +  DBusError error;
  53 +  dbus_error_init (&error);
  54 +
  55 +  libhal_device_add_property_watch (hal_ctx, udi, &error);
  56
  57    device = HAL_DEVICE (g_object_new (HAL_TYPE_DEVICE, NULL));
  58    device->priv->udi = g_strdup (udi);
  59    device->priv->hal_ctx = hal_ctx;
  60    device->priv->properties = properties;
  61 +
  62 +  dbus_error_free (&error);
  63 +
  64    return device;
  65  }
  66