2 files changed, 5 insertions, 8 deletions
diff --git a/addressbook/gui/component/addressbook-config.c b/addressbook/gui/component/addressbook-config.c
index b9dd4adb20..77624a6ee5 100644
--- a/addressbook/gui/component/addressbook-config.c
+++ b/addressbook/gui/component/addressbook-config.c
@@ -145,8 +145,7 @@ ldap_unparse_auth (AddressbookLDAPAuthType auth_type)
 	case ADDRESSBOOK_LDAP_AUTH_SIMPLE_BINDDN:
 		return "ldap/simple-binddn";
 	default:
-		g_assert(0);
-		return "none";
+		g_return_val_if_reached ("none");
 	}
 }
 
@@ -175,8 +174,7 @@ ldap_unparse_scope (AddressbookLDAPScopeType scope_type)
 	case ADDRESSBOOK_LDAP_SCOPE_SUBTREE:
 		return "sub";
 	default:
-		g_assert(0);
-		return "";
+		g_return_val_if_reached ("");
 	}
 }
 
@@ -191,8 +189,7 @@ ldap_unparse_ssl (AddressbookLDAPSSLType ssl_type)
 	case ADDRESSBOOK_LDAP_SSL_ALWAYS:
 		return "always";
 	default:
-		g_assert(0);
-		return "";
+		g_return_val_if_reached ("");
 	}
 }
 
@@ -217,7 +214,7 @@ source_to_uri_parts (ESource *source, gchar **host, gchar **rootdn, AddressbookL
 	LDAPURLDesc *lud;
 	gint         ldap_error;
 
-	g_assert (source);
+	g_return_val_if_fail (source);
 
 	uri = e_source_get_uri (source);
 	ldap_error = ldap_url_parse ((gchar *) uri, &lud);
diff --git a/addressbook/gui/component/addressbook-view.c b/addressbook/gui/component/addressbook-view.c
index 6a8d3f465d..dea1aa9a22 100644
--- a/addressbook/gui/component/addressbook-view.c
+++ b/addressbook/gui/component/addressbook-view.c
@@ -686,7 +686,7 @@ control_activate_cb (BonoboControl *control,
 	EABView *v = get_current_view (view);
 
 	uic = bonobo_control_get_ui_component (control);
-	g_assert (uic != NULL);
+	g_return_if_fail (uic != NULL);
 
 	if (activate) {
 		control_activate (control, uic, view);