empathy r862 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Wed Apr  2 14:12:43 2008
New Revision: 862
URL: http://svn.gnome.org/viewvc/empathy?rev=862&view=rev

Log:
Display a warning if used when not ready instead of silently return.


Modified:
   trunk/libempathy/empathy-tp-contact-factory.c

Modified: trunk/libempathy/empathy-tp-contact-factory.c
==============================================================================
--- trunk/libempathy/empathy-tp-contact-factory.c	(original)
+++ trunk/libempathy/empathy-tp-contact-factory.c	Wed Apr  2 14:12:43 2008
@@ -586,9 +586,7 @@
 	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 @@
 
 	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 @@
 	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;