diff options
| author | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-08-31 13:24:51 +0800 |
|---|---|---|
| committer | Srinivasa Ragavan <sragavan@src.gnome.org> | 2007-08-31 13:24:51 +0800 |
| commit | e7d6ad6d83acd3aba0dc11d4955339b20ccc8cf3 (patch) | |
| tree | a3bc6a92164f3659ae93f5ff168ef3eed924926c /mail/mail-component.c | |
| parent | 9ea10deea3b27d7bde1b82792cae76b99b5610f6 (diff) | |
| download | gsoc2013-evolution-e7d6ad6d83acd3aba0dc11d4955339b20ccc8cf3.tar gsoc2013-evolution-e7d6ad6d83acd3aba0dc11d4955339b20ccc8cf3.tar.gz gsoc2013-evolution-e7d6ad6d83acd3aba0dc11d4955339b20ccc8cf3.tar.bz2 gsoc2013-evolution-e7d6ad6d83acd3aba0dc11d4955339b20ccc8cf3.tar.lz gsoc2013-evolution-e7d6ad6d83acd3aba0dc11d4955339b20ccc8cf3.tar.xz gsoc2013-evolution-e7d6ad6d83acd3aba0dc11d4955339b20ccc8cf3.tar.zst gsoc2013-evolution-e7d6ad6d83acd3aba0dc11d4955339b20ccc8cf3.zip | |
** Move away from g_assert to g_return* calls
svn path=/trunk/; revision=34143
Diffstat (limited to 'mail/mail-component.c')
| -rw-r--r-- | mail/mail-component.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mail/mail-component.c b/mail/mail-component.c index 79d5350fc8..6e1c1f0732 100644 --- a/mail/mail-component.c +++ b/mail/mail-component.c @@ -404,7 +404,7 @@ view_control_activate_cb (BonoboControl *control, gboolean activate, EMFolderVie static int recover = 0; uic = bonobo_control_get_ui_component (control); - g_assert (uic != NULL); + g_return_if_fail (uic != NULL); if (activate) { Bonobo_UIContainer container; @@ -413,7 +413,7 @@ view_control_activate_cb (BonoboControl *control, gboolean activate, EMFolderVie bonobo_ui_component_set_container (uic, container, NULL); bonobo_object_release_unref (container, NULL); - g_assert (container == bonobo_ui_component_get_container(uic)); + g_return_if_fail (container == bonobo_ui_component_get_container(uic)); g_return_if_fail (container != CORBA_OBJECT_NIL); em_folder_view_activate (view, uic, activate); @@ -1053,7 +1053,7 @@ setline_done(CamelStore *store, void *data) { struct _setline_data *sd = data; - g_assert(sd->pending > 0); + g_return_if_fail (sd->pending > 0); sd->pending--; if (sd->pending == 0) { @@ -1439,7 +1439,7 @@ mail_component_peek_local_store (MailComponent *mc) struct _CamelFolder * mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id) { - g_assert(id <= MAIL_COMPONENT_FOLDER_LOCAL_INBOX); + g_return_val_if_fail (id <= MAIL_COMPONENT_FOLDER_LOCAL_INBOX, NULL); MAIL_COMPONENT_DEFAULT(mc); mc_setup_local_store(mc); @@ -1459,7 +1459,7 @@ mail_component_get_folder(MailComponent *mc, enum _mail_component_folder_t id) const char * mail_component_get_folder_uri(MailComponent *mc, enum _mail_component_folder_t id) { - g_assert(id <= MAIL_COMPONENT_FOLDER_LOCAL_INBOX); + g_return_val_if_fail (id <= MAIL_COMPONENT_FOLDER_LOCAL_INBOX, NULL); MAIL_COMPONENT_DEFAULT(mc); mc_setup_local_store(mc); |