Commit f44472e7 authored by Christian Hergert's avatar Christian Hergert Committed by Philip Withnall

gobject: fix typecasts via g_object_ref

Now that g_object_ref() propagates the parameter type to the
return value, we need to cast to ensure the result is warning
free.

https://bugzilla.gnome.org/show_bug.cgi?id=790697
parent c26aab36
......@@ -457,7 +457,7 @@ g_async_initable_new_finish (GAsyncInitable *initable,
GError **error)
{
if (g_async_initable_init_finish (initable, res, error))
return g_object_ref (initable);
return g_object_ref (G_OBJECT (initable));
else
return NULL;
}
......@@ -1033,7 +1033,7 @@ g_dbus_object_manager_server_get_object (GDBusObjectManager *_manager,
g_mutex_lock (&manager->priv->lock);
data = g_hash_table_lookup (manager->priv->map_object_path_to_data, object_path);
if (data != NULL)
ret = g_object_ref (data->object);
ret = g_object_ref (G_DBUS_OBJECT (data->object));
g_mutex_unlock (&manager->priv->lock);
return ret;
......
......@@ -57,7 +57,7 @@ _g_local_file_io_stream_new (GLocalFileOutputStream *output_stream)
int fd;
stream = g_object_new (G_TYPE_LOCAL_FILE_IO_STREAM, NULL);
stream->output_stream = g_object_ref (output_stream);
stream->output_stream = g_object_ref (G_OUTPUT_STREAM (output_stream));
_g_local_file_output_stream_set_do_close (output_stream, FALSE);
fd = _g_local_file_output_stream_get_fd (output_stream);
stream->input_stream = (GInputStream *)_g_local_file_input_stream_new (fd);
......
......@@ -1088,7 +1088,7 @@ g_network_address_connectable_enumerate (GSocketConnectable *connectable)
GNetworkAddressAddressEnumerator *addr_enum;
addr_enum = g_object_new (G_TYPE_NETWORK_ADDRESS_ADDRESS_ENUMERATOR, NULL);
addr_enum->addr = g_object_ref (connectable);
addr_enum->addr = g_object_ref (G_NETWORK_ADDRESS (connectable));
return (GSocketAddressEnumerator *)addr_enum;
}
......
......@@ -729,7 +729,7 @@ g_network_service_connectable_enumerate (GSocketConnectable *connectable)
GNetworkServiceAddressEnumerator *srv_enum;
srv_enum = g_object_new (G_TYPE_NETWORK_SERVICE_ADDRESS_ENUMERATOR, NULL);
srv_enum->srv = g_object_ref (connectable);
srv_enum->srv = g_object_ref (G_NETWORK_SERVICE (connectable));
srv_enum->resolver = g_resolver_get_default ();
srv_enum->use_proxy = FALSE;
......
......@@ -375,7 +375,7 @@ g_socket_address_connectable_enumerate (GSocketConnectable *connectable)
GSocketAddressAddressEnumerator *sockaddr_enum;
sockaddr_enum = g_object_new (G_TYPE_SOCKET_ADDRESS_ADDRESS_ENUMERATOR, NULL);
sockaddr_enum->sockaddr = g_object_ref (connectable);
sockaddr_enum->sockaddr = g_object_ref (G_SOCKET_ADDRESS (connectable));
return (GSocketAddressEnumerator *)sockaddr_enum;
}
......
......@@ -252,7 +252,7 @@ g_unix_volume_get_mount (GVolume *volume)
GUnixVolume *unix_volume = G_UNIX_VOLUME (volume);
if (unix_volume->mount != NULL)
return g_object_ref (unix_volume->mount);
return g_object_ref (G_MOUNT (unix_volume->mount));
return NULL;
}
......
......@@ -46,7 +46,7 @@ my_singleton_constructor (GType type,
GObjectConstructParam *construct_properties)
{
if (the_one_and_only)
return g_object_ref (the_one_and_only);
return g_object_ref (G_OBJECT (the_one_and_only));
else
return G_OBJECT_CLASS (my_singleton_parent_class)->constructor (type, n_construct_properties, construct_properties);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment