(trunk gtk) add gtr_warn_if_fail(), a portability wrapper for systems too old for...

diff --git a/gtk/tr-core.c b/gtk/tr-core.c
index b1571fa7804f76ba69cf4e1879b334ffa8d10fd0..44e3680b1a540167568030189c180dd4762be76d 100644 (file)
--- a/gtk/tr-core.c
+++ b/gtk/tr-core.c
@@ -1213,7 +1213,7 @@ tr_core_remove_torrent_from_id( TrCore * core, int id, gboolean deleteFiles )
 
         /* remove the torrent */
         tr_torrent_set_remove_flag( gtor, TRUE );
-        g_warn_if_fail( G_OBJECT( gtor )->ref_count == 1 );
+        gtr_warn_if_fail( G_OBJECT( gtor )->ref_count == 1 );
         g_object_unref( G_OBJECT( gtor ) ); /* remove the last refcount */
     }
 }

diff --git a/gtk/util.h b/gtk/util.h
index 7f686947fbaf44a6b17b07a846fe6bdc512645cb..0ee1517017fac3c354324ad5d1047e8888a2047c 100644 (file)
--- a/gtk/util.h
+++ b/gtk/util.h
@@ -14,8 +14,18 @@
 #define GTR_UTIL_H
 
 #include <sys/types.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
+/* portability wrapper around g_warn_if_fail() for older versions of glib */
+#ifdef g_warn_if_fail
+ #define gtr_warn_if_fail(expr) g_warn_if_fail(expr)
+#else
+ #define gtr_warn_if_fail(expr) do { if G_LIKELY (expr) ; else \
+                                       g_log (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, "%s:%d func(): %s: invariant failed: %s", \
+                                              __FILE__, __LINE__, G_STRFUNC, #expr ); } while(0)
+#endif
+
 /* macro to shut up "unused parameter" warnings */
 #ifndef UNUSED
  #define UNUSED G_GNUC_UNUSED