From: Pierre-Luc Beaudoin <pierre-luc@pierlux.com>
Date: Sun, 22 Mar 2009 15:42:16 +0000 (+0200)
Subject: Assert and return_on_fail should be && not ||
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e2cb9855ddbb6616f93b06d69735d99c375135aa;p=libchamplain

Assert and return_on_fail should be && not ||
---

diff --git a/champlain/champlain-view.c b/champlain/champlain-view.c
index 1f0ae6e..d9f5563 100644
--- a/champlain/champlain-view.c
+++ b/champlain/champlain-view.c
@@ -1285,7 +1285,7 @@ void
 champlain_view_set_map_source (ChamplainView *view,
                                ChamplainMapSource *source)
 {
-  g_return_if_fail (CHAMPLAIN_IS_VIEW (view) ||
+  g_return_if_fail (CHAMPLAIN_IS_VIEW (view) &&
       CHAMPLAIN_IS_MAP_SOURCE (source));
 
   ClutterActor *group;
@@ -1339,8 +1339,8 @@ void
 champlain_view_set_decel_rate (ChamplainView *view,
                                gdouble rate)
 {
-  g_return_if_fail (CHAMPLAIN_IS_VIEW (view) ||
-      rate > 2.0 ||
+  g_return_if_fail (CHAMPLAIN_IS_VIEW (view) &&
+      rate > 2.0 &&
       rate < 0);
 
   ChamplainViewPrivate *priv = GET_PRIVATE (view);