gvfs r1931 - in trunk: . monitor/hal monitor/proxy

[davidz svn gnome org]

Author: davidz
Date: Tue Sep  2 19:36:29 2008
New Revision: 1931
URL: http://svn.gnome.org/viewvc/gvfs?rev=1931&view=rev

Log:
2008-09-02  David Zeuthen  <davidz redhat com>

        * monitor/hal/ghaldrive.c: (g_hal_drive_eject_do):
        * monitor/hal/ghalmount.c: (unmount_cb), (unmount_do),
        (eject_wrapper_callback), (g_hal_mount_eject):
        * monitor/proxy/gproxymount.c: (eject_wrapper_callback),
        (g_proxy_mount_eject):
        * monitor/proxy/gproxyvolume.c: (eject_wrapper_callback):
        Remember to refcount objects (#546971).



Modified:
   trunk/ChangeLog
   trunk/monitor/hal/ghaldrive.c
   trunk/monitor/hal/ghalmount.c
   trunk/monitor/proxy/gproxymount.c
   trunk/monitor/proxy/gproxyvolume.c

Modified: trunk/monitor/hal/ghaldrive.c
==============================================================================
--- trunk/monitor/hal/ghaldrive.c	(original)
+++ trunk/monitor/hal/ghaldrive.c	Tue Sep  2 19:36:29 2008
@@ -644,7 +644,7 @@
   G_UNLOCK (hal_drive);
   
   data = g_new0 (SpawnOp, 1);
-  data->object = G_OBJECT (drive);
+  data->object = g_object_ref (drive);
   data->callback = callback;
   data->user_data = user_data;
   data->cancellable = cancellable;

Modified: trunk/monitor/hal/ghalmount.c
==============================================================================
--- trunk/monitor/hal/ghalmount.c	(original)
+++ trunk/monitor/hal/ghalmount.c	Tue Sep  2 19:36:29 2008
@@ -957,6 +957,8 @@
   g_string_free (data->error_string, TRUE);
   close (data->error_fd);
   g_spawn_close_pid (pid);
+
+  g_object_unref (data->object);
   g_free (data);
 }
 
@@ -988,7 +990,7 @@
   GError *error;
 
   data = g_new0 (UnmountOp, 1);
-  data->object = G_OBJECT (mount);
+  data->object = g_object_ref (mount);
   data->callback = callback;
   data->user_data = user_data;
   data->cancellable = cancellable;  
@@ -1079,6 +1081,7 @@
 {
   EjectWrapperOp *data  = user_data;
   data->callback (data->object, res, data->user_data);
+  g_object_unref (data->object);
   g_free (data);
 }
 
@@ -1102,7 +1105,7 @@
     {
       EjectWrapperOp *data;
       data = g_new0 (EjectWrapperOp, 1);
-      data->object = G_OBJECT (mount);
+      data->object = g_object_ref (mount);
       data->callback = callback;
       data->user_data = user_data;
       g_drive_eject (drive, flags, cancellable, eject_wrapper_callback, data);

Modified: trunk/monitor/proxy/gproxymount.c
==============================================================================
--- trunk/monitor/proxy/gproxymount.c	(original)
+++ trunk/monitor/proxy/gproxymount.c	Tue Sep  2 19:36:29 2008
@@ -361,6 +361,7 @@
 {
   EjectWrapperOp *data  = user_data;
   data->callback (data->object, res, data->user_data);
+  g_object_unref (data->object);
   g_free (data);
 }
 
@@ -379,7 +380,7 @@
     {
       EjectWrapperOp *data;
       data = g_new0 (EjectWrapperOp, 1);
-      data->object = G_OBJECT (mount);
+      data->object = g_object_ref (mount);
       data->callback = callback;
       data->user_data = user_data;
       g_drive_eject (drive, flags, cancellable, eject_wrapper_callback, data);

Modified: trunk/monitor/proxy/gproxyvolume.c
==============================================================================
--- trunk/monitor/proxy/gproxyvolume.c	(original)
+++ trunk/monitor/proxy/gproxyvolume.c	Tue Sep  2 19:36:29 2008
@@ -413,6 +413,7 @@
 {
   EjectWrapperOp *data  = user_data;
   data->callback (data->object, res, data->user_data);
+  g_object_unref (data->object);
   g_free (data);
 }