gdbus: Use casting macros where possible

3 files changed, 6 insertions, 6 deletions

diff --git a/client/gdaemonfileenumerator.c b/client/gdaemonfileenumerator.c
index e7d48b0f..1e2b7de7 100644
--- a/client/gdaemonfileenumerator.c
+++ b/client/gdaemonfileenumerator.c
@@ -169,7 +169,7 @@ handle_done (GVfsDBusEnumerator *object,
              GDBusMethodInvocation *invocation,
              gpointer user_data)
 {
-  GDaemonFileEnumerator *enumerator = user_data;
+  GDaemonFileEnumerator *enumerator = G_DAEMON_FILE_ENUMERATOR (user_data);
 
   g_print ("handle_done: daemon = %p, async_requested_files = %d\n", enumerator, enumerator->async_requested_files);
 
@@ -191,7 +191,7 @@ handle_got_info (GVfsDBusEnumerator *object,
                  GVariant *arg_infos,
                  gpointer user_data)
 {
-  GDaemonFileEnumerator *enumerator = user_data;
+  GDaemonFileEnumerator *enumerator = G_DAEMON_FILE_ENUMERATOR (user_data);
   GList *infos;
   GFileInfo *info;
   GVariantIter iter;
@@ -314,7 +314,7 @@ enumerate_keys_callback (const char *key,
 			 gpointer value,
 			 gpointer user_data)
 {
-  GFileInfo  *info = user_data;
+  GFileInfo *info = G_FILE_INFO (user_data);
   char *attr;
 
   attr = g_strconcat ("metadata::", key, NULL);
diff --git a/client/gdaemonfilemonitor.c b/client/gdaemonfilemonitor.c
index 71de50e5..6b5a7fe3 100644
--- a/client/gdaemonfilemonitor.c
+++ b/client/gdaemonfilemonitor.c
@@ -91,7 +91,7 @@ handle_changed (GVfsDBusMonitorClient *object,
                 const gchar *arg_other_file_path,
                 gpointer user_data)
 {
-  GDaemonFileMonitor* monitor = user_data;
+  GDaemonFileMonitor *monitor = G_DAEMON_FILE_MONITOR (user_data);
   GMountSpec *spec1, *spec2;
   GFile *file1, *file2;
 
diff --git a/client/gvfsdaemondbus.c b/client/gvfsdaemondbus.c
index c2cdb24f..034eef9f 100644
--- a/client/gvfsdaemondbus.c
+++ b/client/gvfsdaemondbus.c
@@ -245,7 +245,7 @@ get_connection_for_async (const char *dbus_id)
 static void
 close_and_unref_connection (void *data)
 {
-  GDBusConnection *connection = data;
+  GDBusConnection *connection = G_DBUS_CONNECTION (data);
   
   g_print ("close_and_unref_connection: closing connection\n");
   
@@ -527,7 +527,7 @@ _g_dbus_async_subscribe_cancellable (GDBusConnection *connection, GCancellable *
       cancel_data->serial = g_dbus_connection_get_last_serial (connection);
       cancelled_tag =
         g_signal_connect_data (cancellable, "cancelled",
-                               (GCallback)async_call_cancelled_cb,
+                               G_CALLBACK (async_call_cancelled_cb),
                                cancel_data,
                                (GClosureNotify)async_call_cancel_data_free,
                                0);