Commit 7ca6b00d authored by Tim Janik's avatar Tim Janik Committed by Tim Janik

removed extraneous GObject* returns from a couple functions that are very

Mon Sep 10 20:31:37 2001  Tim Janik  <timj@gtk.org>

        * gobject.[hc]: removed extraneous GObject* returns from a
        couple functions that are very unlikely to be used in nested.
        changed gpointer->GObject* for a couple return values/arguments.
        this fixes #50206.
parent dc0b74d4
......@@ -296,6 +296,7 @@ to match the one used with g_object_add_weak_pointer().
@object:
@signal_spec:
@Varargs:
<!-- # Unused Parameters # -->
@Returns:
......@@ -307,6 +308,7 @@ to match the one used with g_object_add_weak_pointer().
@object:
@first_property_name:
@Varargs:
<!-- # Unused Parameters # -->
@Returns:
......
Mon Sep 10 20:31:37 2001 Tim Janik <timj@gtk.org>
* gobject.[hc]: removed extraneous GObject* returns from a
couple functions that are very unlikely to be used in nested.
changed gpointer->GObject* for a couple return values/arguments.
this fixes #50206.
Mon Sep 10 19:27:47 2001 Tim Janik <timj@gtk.org>
* gtype.[hc]:
......
......@@ -720,7 +720,7 @@ g_object_newv (GType object_type,
return object;
}
gpointer
GObject*
g_object_new_valist (GType object_type,
const gchar *first_property_name,
va_list var_args)
......@@ -949,7 +949,7 @@ g_object_get_valist (GObject *object,
g_object_unref (object);
}
gpointer
void
g_object_set (gpointer _object,
const gchar *first_property_name,
...)
......@@ -957,13 +957,11 @@ g_object_set (gpointer _object,
GObject *object = _object;
va_list var_args;
g_return_val_if_fail (G_IS_OBJECT (object), NULL);
g_return_if_fail (G_IS_OBJECT (object));
va_start (var_args, first_property_name);
g_object_set_valist (object, first_property_name, var_args);
va_end (var_args);
return object;
}
void
......@@ -1132,7 +1130,7 @@ g_object_connect (gpointer _object,
return object;
}
gpointer
void
g_object_disconnect (gpointer _object,
const gchar *signal_spec,
...)
......@@ -1140,8 +1138,8 @@ g_object_disconnect (gpointer _object,
GObject *object = _object;
va_list var_args;
g_return_val_if_fail (G_IS_OBJECT (object), NULL);
g_return_val_if_fail (object->ref_count > 0, object);
g_return_if_fail (G_IS_OBJECT (object));
g_return_if_fail (object->ref_count > 0);
va_start (var_args, signal_spec);
while (signal_spec)
......@@ -1176,8 +1174,6 @@ g_object_disconnect (gpointer _object,
signal_spec = va_arg (var_args, gchar*);
}
va_end (var_args);
return object;
}
typedef struct {
......@@ -1670,9 +1666,8 @@ g_closure_new_object (guint sizeof_closure,
GClosure*
g_cclosure_new_object (GCallback callback_func,
gpointer _object)
GObject *object)
{
GObject *object = _object;
GClosure *closure;
g_return_val_if_fail (G_IS_OBJECT (object), NULL);
......@@ -1687,9 +1682,8 @@ g_cclosure_new_object (GCallback callback_func,
GClosure*
g_cclosure_new_object_swap (GCallback callback_func,
gpointer _object)
GObject *object)
{
GObject *object = _object;
GClosure *closure;
g_return_val_if_fail (G_IS_OBJECT (object), NULL);
......
......@@ -116,10 +116,10 @@ gpointer g_object_new (GType object_type,
gpointer g_object_newv (GType object_type,
guint n_parameters,
GParameter *parameters);
gpointer g_object_new_valist (GType object_type,
GObject* g_object_new_valist (GType object_type,
const gchar *first_property_name,
va_list var_args);
gpointer g_object_set (gpointer object,
void g_object_set (gpointer object,
const gchar *first_property_name,
...);
void g_object_get (gpointer object,
......@@ -128,7 +128,7 @@ void g_object_get (gpointer object,
gpointer g_object_connect (gpointer object,
const gchar *signal_spec,
...);
gpointer g_object_disconnect (gpointer object,
void g_object_disconnect (gpointer object,
const gchar *signal_spec,
...);
void g_object_set_valist (GObject *object,
......@@ -184,9 +184,9 @@ gpointer g_object_steal_data (GObject *object,
void g_object_watch_closure (GObject *object,
GClosure *closure);
GClosure* g_cclosure_new_object (GCallback callback_func,
gpointer object);
GObject *object);
GClosure* g_cclosure_new_object_swap (GCallback callback_func,
gpointer object);
GObject *object);
GClosure* g_closure_new_object (guint sizeof_closure,
GObject *object);
void g_value_set_object (GValue *value,
......
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