diff options
| author | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-07 00:49:49 +0800 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@src.gnome.org> | 2009-01-07 00:49:49 +0800 |
| commit | 941c3de3ffaf5320d6959fb84db24dd0807649c7 (patch) | |
| tree | 97b6c1db897d42fe9f9fdad72bc7d113ed9eaa41 | |
| parent | 4e5ed70e9a4612b84562b0292c745ee0f6cab5ae (diff) | |
| download | gsoc2013-empathy-941c3de3ffaf5320d6959fb84db24dd0807649c7.tar gsoc2013-empathy-941c3de3ffaf5320d6959fb84db24dd0807649c7.tar.gz gsoc2013-empathy-941c3de3ffaf5320d6959fb84db24dd0807649c7.tar.bz2 gsoc2013-empathy-941c3de3ffaf5320d6959fb84db24dd0807649c7.tar.lz gsoc2013-empathy-941c3de3ffaf5320d6959fb84db24dd0807649c7.tar.xz gsoc2013-empathy-941c3de3ffaf5320d6959fb84db24dd0807649c7.tar.zst gsoc2013-empathy-941c3de3ffaf5320d6959fb84db24dd0807649c7.zip | |
Use g_return_[val]_if_fail instead of g_assert in public APIs.
svn path=/trunk/; revision=2097
| -rw-r--r-- | libempathy/empathy-account-manager.c | 6 | ||||
| -rw-r--r-- | libempathy/empathy-contact-monitor.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libempathy/empathy-account-manager.c b/libempathy/empathy-account-manager.c index 42d80feab..b3ccd6de3 100644 --- a/libempathy/empathy-account-manager.c +++ b/libempathy/empathy-account-manager.c @@ -585,7 +585,7 @@ empathy_account_manager_get_connected_accounts (EmpathyAccountManager *manager) { 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 @@ empathy_account_manager_get_connecting_accounts (EmpathyAccountManager *manager) { 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 @@ empathy_account_manager_is_account_just_connected (EmpathyAccountManager *manage 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); diff --git a/libempathy/empathy-contact-monitor.c b/libempathy/empathy-contact-monitor.c index 525c1d427..dd1bd03f7 100644 --- a/libempathy/empathy-contact-monitor.c +++ b/libempathy/empathy-contact-monitor.c @@ -391,8 +391,8 @@ empathy_contact_monitor_set_proxy (EmpathyContactMonitor *self, { 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 @@ empathy_contact_monitor_new_for_proxy (EmpathyContactList *proxy) { 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); |