Add missing casts for g_object_ref

g_object_ref() currently propagates parameter type to its return value,
so type casts needs to be added in order to prevent compiler warnings.

11 files changed, 15 insertions, 15 deletions

diff --git a/daemon/gvfsbackendftp.c b/daemon/gvfsbackendftp.c
index 4fcbc65f..d5540250 100644
--- a/daemon/gvfsbackendftp.c
+++ b/daemon/gvfsbackendftp.c
@@ -624,7 +624,7 @@ try_login:
         {
           g_debug ("# error querying remote address: %s\nUsing original address instead.\n", task.error->message);
           g_vfs_ftp_task_clear_error (&task);
-          ftp->addr = g_object_ref (addr);
+          ftp->addr = G_SOCKET_CONNECTABLE (g_object_ref (addr));
         }
     }
 
diff --git a/daemon/gvfsbackendgoogle.c b/daemon/gvfsbackendgoogle.c
index 0fe4b957..6aa7e7c0 100644
--- a/daemon/gvfsbackendgoogle.c
+++ b/daemon/gvfsbackendgoogle.c
@@ -1866,7 +1866,7 @@ g_vfs_backend_google_push (GVfsBackend           *_self,
 
   if (needs_overwrite)
     {
-      document = g_object_ref (existing_entry);
+      document = GDATA_DOCUMENTS_DOCUMENT (g_object_ref (existing_entry));
       title = gdata_entry_get_title (existing_entry);
 
       error = NULL;
diff --git a/daemon/gvfsbackendnfs.c b/daemon/gvfsbackendnfs.c
index fac39466..566fda78 100644
--- a/daemon/gvfsbackendnfs.c
+++ b/daemon/gvfsbackendnfs.c
@@ -1468,7 +1468,7 @@ try_close_write (GVfsBackend *backend,
   GVfsBackendNfs *op_backend = G_VFS_BACKEND_NFS (backend);
   WriteHandle *handle = _handle;
 
-  handle->job = g_object_ref (job);
+  handle->job = G_VFS_JOB (g_object_ref (job));
   nfs_fstat64_async (op_backend->ctx, handle->fh, close_stat_cb, handle);
 
   return TRUE;
diff --git a/monitor/gphoto2/ggphoto2volumemonitor.c b/monitor/gphoto2/ggphoto2volumemonitor.c
index ef2aaa52..0d141cdb 100644
--- a/monitor/gphoto2/ggphoto2volumemonitor.c
+++ b/monitor/gphoto2/ggphoto2volumemonitor.c
@@ -283,7 +283,7 @@ g_gphoto2_volume_monitor_constructor (GType                  type,
   G_LOCK (gphoto2_vm);
   if (the_volume_monitor != NULL)
     {
-      object = g_object_ref (the_volume_monitor);
+      object = G_OBJECT (g_object_ref (the_volume_monitor));
       G_UNLOCK (gphoto2_vm);
       return object;
     }
diff --git a/monitor/mtp/gmtpvolumemonitor.c b/monitor/mtp/gmtpvolumemonitor.c
index 1e73db73..75884aaf 100644
--- a/monitor/mtp/gmtpvolumemonitor.c
+++ b/monitor/mtp/gmtpvolumemonitor.c
@@ -242,7 +242,7 @@ g_mtp_volume_monitor_constructor (GType                  type,
 
   G_LOCK (vm_lock);
   if (the_volume_monitor != NULL) {
-    object = g_object_ref (the_volume_monitor);
+    object = G_OBJECT (g_object_ref (the_volume_monitor));
     G_UNLOCK (vm_lock);
     return object;
   }
diff --git a/monitor/proxy/gproxymount.c b/monitor/proxy/gproxymount.c
index c5525c8f..b51094cd 100644
--- a/monitor/proxy/gproxymount.c
+++ b/monitor/proxy/gproxymount.c
@@ -408,7 +408,7 @@ g_proxy_mount_eject_with_operation (GMount              *mount,
     {
       EjectWrapperOp *data;
       data = g_new0 (EjectWrapperOp, 1);
-      data->object = g_object_ref (mount);
+      data->object = G_OBJECT (g_object_ref (mount));
       data->callback = callback;
       data->user_data = user_data;
       g_drive_eject_with_operation (drive, flags, mount_operation, cancellable, eject_wrapper_callback, data);
diff --git a/monitor/proxy/gproxyshadowmount.c b/monitor/proxy/gproxyshadowmount.c
index a16ce9c1..cae72325 100644
--- a/monitor/proxy/gproxyshadowmount.c
+++ b/monitor/proxy/gproxyshadowmount.c
@@ -267,7 +267,7 @@ g_proxy_shadow_mount_get_volume (GMount *mount)
   GVolume *volume;
 
   G_LOCK (proxy_shadow_mount);
-  volume = g_object_ref (proxy_shadow_mount->volume);
+  volume = G_VOLUME (g_object_ref (proxy_shadow_mount->volume));
   G_UNLOCK (proxy_shadow_mount);
 
   return volume;
@@ -325,7 +325,7 @@ setup_async_wrapper (GMount *mount,
   AsyncWrapperOp *data;
   
   data = g_new0 (AsyncWrapperOp, 1);
-  data->object = g_object_ref (mount);
+  data->object = G_OBJECT (g_object_ref (mount));
   data->callback = callback;
   data->user_data = user_data;
   return data;
diff --git a/monitor/proxy/gproxyvolume.c b/monitor/proxy/gproxyvolume.c
index 90c0e778..f353b72d 100644
--- a/monitor/proxy/gproxyvolume.c
+++ b/monitor/proxy/gproxyvolume.c
@@ -592,7 +592,7 @@ g_proxy_volume_get_mount (GVolume *volume)
 
   if (proxy_volume->shadow_mount != NULL)
     {
-      mount = g_object_ref (proxy_volume->shadow_mount);
+      mount = G_MOUNT (g_object_ref (proxy_volume->shadow_mount));
     }
   else if (proxy_volume->mount_id != NULL && strlen (proxy_volume->mount_id) > 0)
     {
@@ -648,7 +648,7 @@ g_proxy_volume_eject_with_operation (GVolume             *volume,
     {
       EjectWrapperOp *data;
       data = g_new0 (EjectWrapperOp, 1);
-      data->object = g_object_ref (volume);
+      data->object = G_OBJECT (g_object_ref (volume));
       data->callback = callback;
       data->user_data = user_data;
       g_drive_eject_with_operation (G_DRIVE (drive), flags, mount_operation, cancellable, eject_wrapper_callback, data);
diff --git a/monitor/proxy/gproxyvolumemonitor.c b/monitor/proxy/gproxyvolumemonitor.c
index d2585464..9b2a973c 100644
--- a/monitor/proxy/gproxyvolumemonitor.c
+++ b/monitor/proxy/gproxyvolumemonitor.c
@@ -336,7 +336,7 @@ get_mount_for_mount_path (const char *mount_path,
       while (g_hash_table_iter_next (&vol_hash_iter, NULL, (gpointer) &candidate_mount)) {
         if (g_proxy_mount_has_mount_path (candidate_mount, mount_path))
           {
-            mount = g_object_ref (candidate_mount);
+            mount = G_MOUNT (g_object_ref (candidate_mount));
             goto out;
           }
       }
diff --git a/monitor/udisks2/gvfsudisks2volume.c b/monitor/udisks2/gvfsudisks2volume.c
index d93b1a9c..d204e4a0 100644
--- a/monitor/udisks2/gvfsudisks2volume.c
+++ b/monitor/udisks2/gvfsudisks2volume.c
@@ -809,7 +809,7 @@ gvfs_udisks2_volume_get_drive (GVolume *volume)
   GDrive *drive = NULL;
 
   if (gdu_volume->drive != NULL)
-    drive = g_object_ref (gdu_volume->drive);
+    drive = G_DRIVE (g_object_ref (gdu_volume->drive));
   return drive;
 }
 
@@ -820,7 +820,7 @@ gvfs_udisks2_volume_get_mount (GVolume *volume)
   GMount *mount = NULL;
 
   if (gdu_volume->mount != NULL)
-    mount = g_object_ref (gdu_volume->mount);
+    mount = G_MOUNT (g_object_ref (gdu_volume->mount));
   return mount;
 }
 
diff --git a/monitor/udisks2/gvfsudisks2volumemonitor.c b/monitor/udisks2/gvfsudisks2volumemonitor.c
index 4d43fc1d..c6a3f479 100644
--- a/monitor/udisks2/gvfsudisks2volumemonitor.c
+++ b/monitor/udisks2/gvfsudisks2volumemonitor.c
@@ -267,7 +267,7 @@ get_mount_for_mount_path (const gchar  *mount_path,
           GVfsUDisks2Mount *mount = GVFS_UDISKS2_MOUNT (l->data);
           if (g_strcmp0 (gvfs_udisks2_mount_get_mount_path (mount), mount_path) == 0)
             {
-              ret = g_object_ref (mount);
+              ret = G_MOUNT (g_object_ref (mount));
               goto out;
             }
         }
@@ -289,7 +289,7 @@ gvfs_udisks2_volume_monitor_constructor (GType                  type,
 
   if (the_volume_monitor != NULL)
     {
-      ret = g_object_ref (the_volume_monitor);
+      ret = G_OBJECT (g_object_ref (the_volume_monitor));
       goto out;
     }