diff options
| -rw-r--r-- | libempathy/empathy-tp-contact-factory.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/libempathy/empathy-tp-contact-factory.c b/libempathy/empathy-tp-contact-factory.c index 4737b2fb7..66be90270 100644 --- a/libempathy/empathy-tp-contact-factory.c +++ b/libempathy/empathy-tp-contact-factory.c @@ -586,9 +586,7 @@ tp_contact_factory_request_everything (EmpathyTpContactFactory *tp_factory, EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory); guint *dup_handles; - if (!priv->ready) { - return; - } + g_return_if_fail (priv->ready); dup_handles = g_malloc0 ((handles->len + 1) * sizeof (guint)); g_memmove (dup_handles, handles->data, handles->len * sizeof (guint)); @@ -1075,13 +1073,10 @@ empathy_tp_contact_factory_set_alias (EmpathyTpContactFactory *tp_factory, g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory)); g_return_if_fail (EMPATHY_IS_CONTACT (contact)); + g_return_if_fail (priv->ready); g_return_if_fail (empathy_account_equal (empathy_contact_get_account (contact), priv->account)); - if (!priv->ready) { - return; - } - handle = empathy_contact_get_handle (contact); empathy_debug (DEBUG_DOMAIN, "Setting alias for contact %s (%d) to %s", @@ -1116,10 +1111,7 @@ empathy_tp_contact_factory_set_avatar (EmpathyTpContactFactory *tp_factory, EmpathyTpContactFactoryPriv *priv = GET_PRIV (tp_factory); g_return_if_fail (EMPATHY_IS_TP_CONTACT_FACTORY (tp_factory)); - - if (!priv->ready) { - return; - } + g_return_if_fail (priv->ready); if (data && size > 0 && size < G_MAXUINT) { GArray avatar; |