[gvfs] proxydrive: Use proper object casting



commit ff909269ab889e81f83d3c08a7c8b612306b4473
Author: Tomas Bzatek <tbzatek redhat com>
Date:   Fri Sep 7 15:34:13 2012 +0200

    proxydrive: Use proper object casting
    
    Just a little cleanup to be on a safe side.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=683191

 monitor/proxy/gproxydrive.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/monitor/proxy/gproxydrive.c b/monitor/proxy/gproxydrive.c
index feaf6d5..a8ac61d 100644
--- a/monitor/proxy/gproxydrive.c
+++ b/monitor/proxy/gproxydrive.c
@@ -640,7 +640,7 @@ g_proxy_drive_eject_with_operation (GDrive              *drive,
     }
 
   data = g_new0 (DBusOp, 1);
-  data->drive = g_object_ref (drive);
+  data->drive = g_object_ref (proxy_drive);
   data->callback = callback;
   data->user_data = user_data;
   data->mount_op_id = g_proxy_mount_operation_wrap (mount_operation, proxy_drive->volume_monitor);
@@ -659,7 +659,7 @@ g_proxy_drive_eject_with_operation (GDrive              *drive,
       data->cancellation_id = g_strdup ("");
     }
 
-  proxy = g_proxy_volume_monitor_get_dbus_proxy (data->drive->volume_monitor);
+  proxy = g_proxy_volume_monitor_get_dbus_proxy (proxy_drive->volume_monitor);
   g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (proxy), G_PROXY_VOLUME_MONITOR_DBUS_TIMEOUT);  /* 30 minute timeout */
   
   gvfs_remote_volume_monitor_call_drive_eject (proxy,
@@ -790,7 +790,7 @@ g_proxy_drive_stop (GDrive              *drive,
     }
 
   data = g_new0 (DBusOp, 1);
-  data->drive = g_object_ref (drive);
+  data->drive = g_object_ref (proxy_drive);
   data->callback = callback;
   data->user_data = user_data;
   data->mount_op_id = g_proxy_mount_operation_wrap (mount_operation, proxy_drive->volume_monitor);
@@ -809,7 +809,7 @@ g_proxy_drive_stop (GDrive              *drive,
       data->cancellation_id = g_strdup ("");
     }
 
-  proxy = g_proxy_volume_monitor_get_dbus_proxy (data->drive->volume_monitor);
+  proxy = g_proxy_volume_monitor_get_dbus_proxy (proxy_drive->volume_monitor);
   g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (proxy), G_PROXY_VOLUME_MONITOR_DBUS_TIMEOUT);  /* 30 minute timeout */
 
   gvfs_remote_volume_monitor_call_drive_stop (proxy,
@@ -966,7 +966,7 @@ g_proxy_drive_start (GDrive              *drive,
     }
 
   data = g_new0 (DBusStartOp, 1);
-  data->drive = g_object_ref (drive);
+  data->drive = g_object_ref (proxy_drive);
   data->callback = callback;
   data->user_data = user_data;
   if (cancellable != NULL)
@@ -985,7 +985,7 @@ g_proxy_drive_start (GDrive              *drive,
 
   data->mount_op_id = g_proxy_mount_operation_wrap (mount_operation, proxy_drive->volume_monitor);
 
-  proxy = g_proxy_volume_monitor_get_dbus_proxy (data->drive->volume_monitor);
+  proxy = g_proxy_volume_monitor_get_dbus_proxy (proxy_drive->volume_monitor);
   g_dbus_proxy_set_default_timeout (G_DBUS_PROXY (proxy), G_PROXY_VOLUME_MONITOR_DBUS_TIMEOUT);  /* 30 minute timeout */
 
   gvfs_remote_volume_monitor_call_drive_start (proxy,
@@ -1091,7 +1091,7 @@ g_proxy_drive_poll_for_media (GDrive              *drive,
     }
 
   data = g_new0 (DBusOp, 1);
-  data->drive = g_object_ref (drive);
+  data->drive = g_object_ref (proxy_drive);
   data->callback = callback;
   data->user_data = user_data;
 
@@ -1109,7 +1109,7 @@ g_proxy_drive_poll_for_media (GDrive              *drive,
       data->cancellation_id = g_strdup ("");
     }
   
-  proxy = g_proxy_volume_monitor_get_dbus_proxy (data->drive->volume_monitor);
+  proxy = g_proxy_volume_monitor_get_dbus_proxy (proxy_drive->volume_monitor);
   gvfs_remote_volume_monitor_call_drive_poll_for_media (proxy,
                                                         proxy_drive->id,
                                                         data->cancellation_id,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]