empathy r2097 - trunk/libempathy

[xclaesse svn gnome org]

Author: xclaesse
Date: Tue Jan  6 16:49:49 2009
New Revision: 2097
URL: http://svn.gnome.org/viewvc/empathy?rev=2097&view=rev

Log:
Use g_return_[val]_if_fail instead of g_assert in public APIs.

Modified:
   trunk/libempathy/empathy-account-manager.c
   trunk/libempathy/empathy-contact-monitor.c

Modified: trunk/libempathy/empathy-account-manager.c
==============================================================================
--- trunk/libempathy/empathy-account-manager.c	(original)
+++ trunk/libempathy/empathy-account-manager.c	Tue Jan  6 16:49:49 2009
@@ -585,7 +585,7 @@
 {
   EmpathyAccountManagerPriv *priv;
 
-  g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager));
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
 
   priv = GET_PRIV (manager);
 
@@ -597,7 +597,7 @@
 {
   EmpathyAccountManagerPriv *priv;
 
-  g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager));
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), 0);
 
   priv = GET_PRIV (manager);
 
@@ -611,7 +611,7 @@
   EmpathyAccountManagerPriv *priv;
   AccountData *data;
 
-  g_assert (EMPATHY_IS_ACCOUNT_MANAGER (manager));
+  g_return_val_if_fail (EMPATHY_IS_ACCOUNT_MANAGER (manager), FALSE);
 
   priv = GET_PRIV (manager);
   data = g_hash_table_lookup (priv->accounts, account);

Modified: trunk/libempathy/empathy-contact-monitor.c
==============================================================================
--- trunk/libempathy/empathy-contact-monitor.c	(original)
+++ trunk/libempathy/empathy-contact-monitor.c	Tue Jan  6 16:49:49 2009
@@ -391,8 +391,8 @@
 {
   EmpathyContactMonitorPriv *priv;
 
-  g_assert (EMPATHY_IS_CONTACT_MONITOR (self));
-  g_assert (EMPATHY_IS_CONTACT_LIST (proxy));
+  g_return_if_fail (EMPATHY_IS_CONTACT_MONITOR (self));
+  g_return_if_fail (EMPATHY_IS_CONTACT_LIST (proxy));
 
   priv = GET_PRIV (self);
 
@@ -416,7 +416,7 @@
 {
   EmpathyContactMonitor *retval;
 
-  g_assert (EMPATHY_IS_CONTACT_LIST (proxy));
+  g_return_val_if_fail (EMPATHY_IS_CONTACT_LIST (proxy), NULL);
 
   retval = g_object_new (EMPATHY_TYPE_CONTACT_MONITOR,
                          "proxy", proxy, NULL);