metacity r3529 - in trunk: . src/core

[chpe svn gnome org]

Author: chpe
Date: Mon Jan 28 14:52:34 2008
New Revision: 3529
URL: http://svn.gnome.org/viewvc/metacity?rev=3529&view=rev

Log:
2008-01-28  Christian Persch  <chpe gnome org>

	* src/core/display.c: (convert_property):
	* src/core/screen.c: (meta_screen_calc_workspace_layout):
	* src/core/xprops.c: (meta_prop_get_values): 
	Use G_STRFUNC instead of the deprecated G_GNUC_FUNCTION. Bug #512561.

Modified:
   trunk/ChangeLog
   trunk/src/core/display.c
   trunk/src/core/screen.c
   trunk/src/core/xprops.c

Modified: trunk/src/core/display.c
==============================================================================
--- trunk/src/core/display.c	(original)
+++ trunk/src/core/display.c	Mon Jan 28 14:52:34 2008
@@ -4785,7 +4785,7 @@
    * can send SelectionNotify
    */
   /* FIXME the error trap pop synced anyway, right? */
-  meta_topic (META_DEBUG_SYNC, "Syncing on %s\n", G_GNUC_FUNCTION);
+  meta_topic (META_DEBUG_SYNC, "Syncing on %s\n", G_STRFUNC);
   XSync (display->xdisplay, False);
 
   return TRUE;

Modified: trunk/src/core/screen.c
==============================================================================
--- trunk/src/core/screen.c	(original)
+++ trunk/src/core/screen.c	Mon Jan 28 14:52:34 2008
@@ -2255,7 +2255,7 @@
 
   if (i != grid_area)
     meta_bug ("did not fill in the whole workspace grid in %s (%d filled)\n",
-              G_GNUC_FUNCTION, i);
+              G_STRFUNC, i);
   
   current_row = 0;
   current_col = 0;

Modified: trunk/src/core/xprops.c
==============================================================================
--- trunk/src/core/xprops.c	(original)
+++ trunk/src/core/xprops.c	Mon Jan 28 14:52:34 2008
@@ -965,7 +965,7 @@
                * property notify on an atom we don't care about.
                */
               if (values[i].atom != None)
-                meta_bug ("META_PROP_VALUE_INVALID requested in %s\n", G_GNUC_FUNCTION);
+                meta_bug ("META_PROP_VALUE_INVALID requested in %s\n", G_STRFUNC);
               break;
             case META_PROP_VALUE_UTF8_LIST:
             case META_PROP_VALUE_UTF8:
@@ -1015,7 +1015,7 @@
   
   /* Get replies for all our tasks */
   meta_topic (META_DEBUG_SYNC, "Syncing to get %d GetProperty replies in %s\n",
-              n_values, G_GNUC_FUNCTION);
+              n_values, G_STRFUNC);
   XSync (display->xdisplay, False);
   
   /* Collect results, should arrive in order requested */