gimp r24727 - in trunk: . app/base plug-ins/common

[mitch svn gnome org]

Author: mitch
Date: Mon Jan 28 13:19:42 2008
New Revision: 24727
URL: http://svn.gnome.org/viewvc/gimp?rev=24727&view=rev

Log:
2008-01-28  Michael Natterer  <mitch gimp org>

	* app/base/tile-manager.c
	* plug-ins/common/lcms.c: use G_STRLOC instead of
	G_GNUC_FUNCTION (which is now deprecated).



Modified:
   trunk/ChangeLog
   trunk/app/base/tile-manager.c
   trunk/plug-ins/common/lcms.c

Modified: trunk/app/base/tile-manager.c
==============================================================================
--- trunk/app/base/tile-manager.c	(original)
+++ trunk/app/base/tile-manager.c	Mon Jan 28 13:19:42 2008
@@ -400,7 +400,7 @@
 
   if (G_UNLIKELY (num < 0))
     {
-      g_warning ("%s: tile coordinates out of range.", G_GNUC_FUNCTION);
+      g_warning ("%s: tile coordinates out of range.", G_STRLOC);
       return;
     }
 
@@ -427,13 +427,13 @@
 
   if (G_UNLIKELY ((tile_num < 0) || (tile_num >= ntiles)))
     {
-      g_warning ("%s: tile out of range", G_GNUC_FUNCTION);
+      g_warning ("%s: tile out of range", G_STRLOC);
       return;
     }
 
   if (G_UNLIKELY (! tm->tiles))
     {
-      g_warning ("%s: empty tile level - initializing", G_GNUC_FUNCTION);
+      g_warning ("%s: empty tile level - initializing", G_STRLOC);
 
       tm->tiles = g_new (Tile *, ntiles);
       tiles = tm->tiles;
@@ -475,14 +475,14 @@
 #endif
 
   if (G_UNLIKELY (! srctile->valid))
-    g_warning("%s: srctile not validated yet!  please report", G_GNUC_FUNCTION);
+    g_warning("%s: srctile not validated yet!  please report", G_STRLOC);
 
   if (G_UNLIKELY ((*tile_ptr)->ewidth  != srctile->ewidth  ||
                   (*tile_ptr)->eheight != srctile->eheight ||
                   (*tile_ptr)->bpp     != srctile->bpp))
     {
       g_warning ("%s: nonconformant map (%p -> %p)",
-                 G_GNUC_FUNCTION, srctile, *tile_ptr);
+                 G_STRLOC, srctile, *tile_ptr);
     }
 
   tile_detach (*tile_ptr, tm, tile_num);
@@ -645,7 +645,7 @@
 
   if (G_UNLIKELY (tl == NULL))
     {
-      g_warning ("%s: tile not attached to manager", G_GNUC_FUNCTION);
+      g_warning ("%s: tile not attached to manager", G_STRLOC);
       return;
     }
 
@@ -689,7 +689,7 @@
 
   if (G_UNLIKELY (tl == NULL))
     {
-      g_warning ("%s: tile not attached to manager", G_GNUC_FUNCTION);
+      g_warning ("%s: tile not attached to manager", G_STRLOC);
       return;
     }
 

Modified: trunk/plug-ins/common/lcms.c
==============================================================================
--- trunk/plug-ins/common/lcms.c	(original)
+++ trunk/plug-ins/common/lcms.c	Mon Jan 28 13:19:42 2008
@@ -948,7 +948,7 @@
           break;
 
         default:
-          g_warning ("%s: unexpected bpp", G_GNUC_FUNCTION);
+          g_warning ("%s: unexpected bpp", G_STRLOC);
           continue;
         }