Author: benny
Date: 2006-08-24 15:28:45 +0000 (Thu, 24 Aug 2006)
New Revision: 22870
Modified:
thunar/trunk/ChangeLog
thunar/trunk/configure.in.in
thunar/trunk/thunar-vfs/thunar-vfs-private.h
thunar/trunk/thunar/thunar-private.h
thunar/trunk/thunar/thunar-renamer-model.c
thunar/trunk/thunar/thunar-shortcuts-model.c
Log:
2006-08-24 Benedikt Meurer <[EMAIL PROTECTED]>
* thunar/thunar-renamer-model.c, thunar/thunar-shortcuts-model.c: Fix
two typos in the tree model implementations.
* configure.in.in, thunar-vfs/thunar-vfs-private.h,
thunar/thunar-private.h: Use -DNDEBUG in release builds and
-GG_ENABLE_DEBUG only for full debug builds.
Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog 2006-08-24 13:34:54 UTC (rev 22869)
+++ thunar/trunk/ChangeLog 2006-08-24 15:28:45 UTC (rev 22870)
@@ -1,3 +1,11 @@
+2006-08-24 Benedikt Meurer <[EMAIL PROTECTED]>
+
+ * thunar/thunar-renamer-model.c, thunar/thunar-shortcuts-model.c: Fix
+ two typos in the tree model implementations.
+ * configure.in.in, thunar-vfs/thunar-vfs-private.h,
+ thunar/thunar-private.h: Use -DNDEBUG in release builds and
+ -GG_ENABLE_DEBUG only for full debug builds.
+
2006-08-14 Benedikt Meurer <[EMAIL PROTECTED]>
* thunar-vfs/thunar-vfs-path.c(thunar_vfs_path_list_to_string): Use
Modified: thunar/trunk/configure.in.in
===================================================================
--- thunar/trunk/configure.in.in 2006-08-24 13:34:54 UTC (rev 22869)
+++ thunar/trunk/configure.in.in 2006-08-24 15:28:45 UTC (rev 22870)
@@ -270,11 +270,11 @@
])
CFLAGS="$save_CFLAGS"
- dnl Enable extensive debugging
- PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
-
dnl Paranoia for --enable-debug=full
if test x"$enable_debug" = x"full"; then
+ dnl Enable extensive debugging
+ PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_ENABLE_DEBUG"
+
dnl Use -O0 -g3 if the compiler supports it
save_CFLAGS="$CFLAGS"
CFLAGS="$CFLAGS -O0 -g3"
@@ -291,6 +291,9 @@
dnl Print the result
AC_MSG_RESULT([$enable_debug])
+ dnl Disable debugging (release build)
+ PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -NDEBUG"
+
dnl Disable object cast checks
PLATFORM_CPPFLAGS="$PLATFORM_CPPFLAGS -DG_DISABLE_CAST_CHECKS"
@@ -458,6 +461,7 @@
echo "* Startup Notification: no"
fi
echo "* Volume Manager: $ac_bm_thunar_vfs_volume_impl"
+echo "* Debug Support: $enable_debug"
echo
echo "Additional Plugins:"
echo
Modified: thunar/trunk/thunar/thunar-private.h
===================================================================
--- thunar/trunk/thunar/thunar-private.h 2006-08-24 13:34:54 UTC (rev
22869)
+++ thunar/trunk/thunar/thunar-private.h 2006-08-24 15:28:45 UTC (rev
22870)
@@ -26,7 +26,7 @@
G_BEGIN_DECLS;
/* support macros for debugging */
-#ifdef G_ENABLE_DEBUG
+#ifndef NDEBUG
#define _thunar_assert(expr) g_assert (expr)
#define _thunar_assert_not_reached() g_assert_not_reached ()
#define _thunar_return_if_fail(expr) g_return_if_fail (expr)
@@ -56,7 +56,7 @@
#endif
/* avoid trivial g_value_get_*() function calls */
-#ifndef G_ENABLE_DEBUG
+#ifdef NDEBUG
#define g_value_get_boolean(v) (((const GValue *) (v))->data[0].v_int)
#define g_value_get_char(v) (((const GValue *) (v))->data[0].v_int)
#define g_value_get_uchar(v) (((const GValue *) (v))->data[0].v_uint)
Modified: thunar/trunk/thunar/thunar-renamer-model.c
===================================================================
--- thunar/trunk/thunar/thunar-renamer-model.c 2006-08-24 13:34:54 UTC (rev
22869)
+++ thunar/trunk/thunar/thunar-renamer-model.c 2006-08-24 15:28:45 UTC (rev
22870)
@@ -585,7 +585,7 @@
_thunar_return_val_if_fail (THUNAR_IS_RENAMER_MODEL (renamer_model), FALSE);
- if (G_LIKELY (parent != NULL))
+ if (G_LIKELY (parent == NULL))
{
iter->stamp = renamer_model->stamp;
iter->user_data = g_list_nth (renamer_model->items, n);
Modified: thunar/trunk/thunar/thunar-shortcuts-model.c
===================================================================
--- thunar/trunk/thunar/thunar-shortcuts-model.c 2006-08-24 13:34:54 UTC
(rev 22869)
+++ thunar/trunk/thunar/thunar-shortcuts-model.c 2006-08-24 15:28:45 UTC
(rev 22870)
@@ -583,7 +583,7 @@
{
ThunarShortcutsModel *model = THUNAR_SHORTCUTS_MODEL (tree_model);
- _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
+ _thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), 0);
return (iter == NULL) ? g_list_length (model->shortcuts) : 0;
}
@@ -600,7 +600,7 @@
_thunar_return_val_if_fail (THUNAR_IS_SHORTCUTS_MODEL (model), FALSE);
- if (G_LIKELY (parent != NULL))
+ if (G_LIKELY (parent == NULL))
{
iter->stamp = model->stamp;
iter->user_data = g_list_nth (model->shortcuts, n);
Modified: thunar/trunk/thunar-vfs/thunar-vfs-private.h
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-private.h 2006-08-24 13:34:54 UTC
(rev 22869)
+++ thunar/trunk/thunar-vfs/thunar-vfs-private.h 2006-08-24 15:28:45 UTC
(rev 22870)
@@ -30,7 +30,7 @@
G_BEGIN_DECLS;
/* support macros for debugging */
-#ifdef G_ENABLE_DEBUG
+#ifndef NDEBUG
#define _thunar_vfs_assert(expr) g_assert (expr)
#define _thunar_vfs_assert_not_reached() g_assert_not_reached ()
#define _thunar_vfs_return_if_fail(expr) g_return_if_fail (expr)
@@ -60,7 +60,7 @@
#endif
/* avoid trivial g_value_get_*() function calls */
-#ifndef G_ENABLE_DEBUG
+#ifdef NDEBUG
#define g_value_get_boolean(v) (((const GValue *) (v))->data[0].v_int)
#define g_value_get_char(v) (((const GValue *) (v))->data[0].v_int)
#define g_value_get_uchar(v) (((const GValue *) (v))->data[0].v_uint)
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
