aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-11-11 23:27:52 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-11 23:27:52 +0800
commit6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc (patch)
tree6e9dc283e8fb16523fe437b734f85051e090e2af
parent7ce64583fa676e2a71d2236fad9333269a62bf91 (diff)
downloadgsoc2013-empathy-6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc.tar
gsoc2013-empathy-6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc.tar.gz
gsoc2013-empathy-6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc.tar.bz2
gsoc2013-empathy-6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc.tar.lz
gsoc2013-empathy-6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc.tar.xz
gsoc2013-empathy-6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc.tar.zst
gsoc2013-empathy-6ee6fa693dd4cf6d33eae5a5b8c43f08a73563bc.zip
Use two g_asserts rather than g_assert (foo && bar).
svn path=/trunk/; revision=1704
-rw-r--r--libempathy-gtk/empathy-avatar-chooser.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c
index 9ccff0b85..78535b439 100644
--- a/libempathy-gtk/empathy-avatar-chooser.c
+++ b/libempathy-gtk/empathy-avatar-chooser.c
@@ -224,7 +224,8 @@ avatar_chooser_finalize (GObject *object)
priv = GET_PRIV (object);
avatar_chooser_set_account (EMPATHY_AVATAR_CHOOSER (object), NULL);
- g_assert (priv->account == NULL && priv->tp_contact_factory == NULL);
+ g_assert (priv->account == NULL);
+ g_assert (priv->tp_contact_factory == NULL);
g_object_unref (priv->contact_factory);
@@ -367,7 +368,8 @@ can_satisfy_mime_type_requirements (gchar **accepted_mime_types,
return TRUE;
} else {
/* check we're not leaking. */
- g_assert (name == NULL && type == NULL);
+ g_assert (name == NULL);
+ g_assert (type == NULL);
return FALSE;
}
}