[gtk+] Use G_STRFUNC and G_STRLOC instead __FUNCTION__ and __FILE__



commit 12061507b40532c0123dfa3f107fa64075817eb3
Author: Javier Jardón <jjardon gnome org>
Date:   Wed Oct 21 23:02:29 2009 +0200

    Use G_STRFUNC and G_STRLOC instead __FUNCTION__ and __FILE__

 gtk/gtktreeprivate.h |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 44259ab..8b672f2 100644
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -285,14 +285,13 @@ struct _GtkTreeViewPrivate
        {                                                                \
          g_log (G_LOG_DOMAIN,                                           \
                 G_LOG_LEVEL_CRITICAL,                                   \
-		"file %s: line %d (%s): assertion `%s' failed.\n"       \
+		"%s (%s): assertion `%s' failed.\n"                     \
 	        "There is a disparity between the internal view of the GtkTreeView,\n"    \
 		"and the GtkTreeModel.  This generally means that the model has changed\n"\
 		"without letting the view know.  Any display from now on is likely to\n"  \
 		"be incorrect.\n",                                                        \
-                __FILE__,                                               \
-                __LINE__,                                               \
-                __PRETTY_FUNCTION__,                                    \
+                G_STRLOC,                                               \
+                G_STRFUNC,                                              \
                 #expr);                                                 \
          return ret;                                                    \
        };                               }G_STMT_END
@@ -302,14 +301,13 @@ struct _GtkTreeViewPrivate
        {                                                                \
          g_log (G_LOG_DOMAIN,                                           \
                 G_LOG_LEVEL_CRITICAL,                                   \
-		"file %s: line %d (%s): assertion `%s' failed.\n"       \
+		"%s (%s): assertion `%s' failed.\n"                     \
 	        "There is a disparity between the internal view of the GtkTreeView,\n"    \
 		"and the GtkTreeModel.  This generally means that the model has changed\n"\
 		"without letting the view know.  Any display from now on is likely to\n"  \
 		"be incorrect.\n",                                                        \
-                __FILE__,                                               \
-                __LINE__,                                               \
-                __PRETTY_FUNCTION__,                                    \
+                G_STRLOC,                                               \
+                G_STRFUNC,                                              \
                 #expr);                                                 \
          return;                                                        \
        };                               }G_STMT_END



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]