summaryrefslogtreecommitdiff
path: root/gck/gck-object.c
diff options
context:
space:
mode:
authorStef Walter <stefw@collabora.co.uk>2011-09-29 16:28:10 +0200
committerStef Walter <stefw@collabora.co.uk>2011-09-29 16:28:10 +0200
commit1b11a90afead9a0d8f7a3fd830c806b0c116adf3 (patch)
tree7f36bb242e040a2d7efe9200b26882040684a19f /gck/gck-object.c
parentf7003cd2f252d599c369afdb00c3ef8d14f1b09a (diff)
downloadgcr-1b11a90afead9a0d8f7a3fd830c806b0c116adf3.tar.gz
gck: More introspection tweaks, checking for parameters which allow none
Diffstat (limited to 'gck/gck-object.c')
-rw-r--r--gck/gck-object.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gck/gck-object.c b/gck/gck-object.c
index ee89a45..7288760 100644
--- a/gck/gck-object.c
+++ b/gck/gck-object.c
@@ -505,7 +505,7 @@ gck_object_set (GckObject *self, GckAttributes *attrs,
gboolean ret = FALSE;
g_return_val_if_fail (GCK_IS_OBJECT (self), FALSE);
- g_return_val_if_fail (attrs, FALSE);
+ g_return_val_if_fail (attrs != NULL, FALSE);
g_return_val_if_fail (!error || !*error, FALSE);
_gck_attributes_lock (attrs);
@@ -538,7 +538,7 @@ gck_object_set_async (GckObject *self, GckAttributes *attrs, GCancellable *cance
SetAttributes *args;
g_return_if_fail (GCK_IS_OBJECT (self));
- g_return_if_fail (attrs);
+ g_return_if_fail (attrs != NULL);
args = _gck_call_async_prep (self->pv->session, self, perform_set_attributes,
NULL, sizeof (*args), free_set_attributes);
@@ -716,7 +716,6 @@ gck_object_get_full (GckObject *self, gulong *attr_types, guint n_attr_types,
guint i;
g_return_val_if_fail (GCK_IS_OBJECT (self), NULL);
- g_return_val_if_fail (n_attr_types, NULL);
g_return_val_if_fail (!error || !*error, NULL);
attrs = gck_attributes_new ();
@@ -765,7 +764,6 @@ gck_object_get_async (GckObject *self, gulong *attr_types, guint n_attr_types, G
guint i;
g_return_if_fail (GCK_IS_OBJECT (self));
- g_return_if_fail (n_attr_types);
attrs = gck_attributes_new ();
for (i = 0; i < n_attr_types; ++i)