]> err.no Git - libchamplain/commitdiff
Assert and return_on_fail should be && not ||
authorPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Sun, 22 Mar 2009 15:42:16 +0000 (17:42 +0200)
committerPierre-Luc Beaudoin <pierre-luc@pierlux.com>
Sun, 22 Mar 2009 15:42:16 +0000 (17:42 +0200)
champlain/champlain-view.c

index 1f0ae6e73435d7e36ba2be634911a2dff3f38501..d9f55637841a25abce6ce8363045d913b9805186 100644 (file)
@@ -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);