From 0a362c9453f46464d6f227b410f12ff271af16e4 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Sun, 2 Sep 2007 18:51:21 +0000 Subject: ** Fix for bug #471791 (Move away from assert to g_ret) svn path=/trunk/; revision=34157 --- addressbook/gui/widgets/e-addressbook-view.c | 4 ++-- addressbook/gui/widgets/eab-gui-util.c | 2 +- addressbook/gui/widgets/eab-popup-control.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'addressbook/gui/widgets') diff --git a/addressbook/gui/widgets/e-addressbook-view.c b/addressbook/gui/widgets/e-addressbook-view.c index 34a5e69b80..6cb1a994d2 100644 --- a/addressbook/gui/widgets/e-addressbook-view.c +++ b/addressbook/gui/widgets/e-addressbook-view.c @@ -1094,7 +1094,7 @@ table_double_click(ETableScrolled *table, gint row, gint col, GdkEvent *event, E "book", &book, NULL); - g_assert (E_IS_BOOK (book)); + g_return_if_fail (E_IS_BOOK (book)); if (e_contact_get (contact, E_CONTACT_IS_LIST)) eab_show_contact_list_editor (book, contact, FALSE, view->editable); @@ -1365,7 +1365,7 @@ treeview_row_activated(GtkTreeView *treeview, "book", &book, NULL); - g_assert (E_IS_BOOK (book)); + g_return_if_fail (E_IS_BOOK (book)); if (e_card_evolution_list (card)) eab_show_contact_list_editor (book, card, FALSE, view->editable); diff --git a/addressbook/gui/widgets/eab-gui-util.c b/addressbook/gui/widgets/eab-gui-util.c index d4010edc00..52861a2800 100644 --- a/addressbook/gui/widgets/eab-gui-util.c +++ b/addressbook/gui/widgets/eab-gui-util.c @@ -166,7 +166,7 @@ eab_search_result_dialog (GtkWidget *parent, str = _("This query did not complete successfully."); break; default: - g_assert_not_reached (); + g_return_if_reached (); } e_error_run ((GtkWindow *) parent, "addressbook:search-error", str, NULL); diff --git a/addressbook/gui/widgets/eab-popup-control.c b/addressbook/gui/widgets/eab-popup-control.c index 5181d6e73f..81baba6752 100644 --- a/addressbook/gui/widgets/eab-popup-control.c +++ b/addressbook/gui/widgets/eab-popup-control.c @@ -380,7 +380,7 @@ set_prop (BonoboPropertyBag *bag, const BonoboArg *arg, guint arg_id, CORBA_Envi break; default: - g_assert_not_reached (); + g_return_if_reached (); } } @@ -404,7 +404,7 @@ get_prop (BonoboPropertyBag *bag, BonoboArg *arg, guint arg_id, CORBA_Environmen break; default: - g_assert_not_reached (); + g_return_if_reached (); } } -- cgit v1.2.3