metacity r4026 - in trunk: . src/core

[tthurman svn gnome org]

Author: tthurman
Date: Sun Nov 23 18:53:55 2008
New Revision: 4026
URL: http://svn.gnome.org/viewvc/metacity?rev=4026&view=rev

Log:
	* src/core/display.c: remove apparently spurious warnings about
	operations on window "none"



Modified:
   trunk/ChangeLog
   trunk/src/core/display.c
   trunk/src/core/util.c

Modified: trunk/src/core/display.c
==============================================================================
--- trunk/src/core/display.c	(original)
+++ trunk/src/core/display.c	Sun Nov 23 18:53:55 2008
@@ -3264,9 +3264,10 @@
   
   if (display->grab_op != META_GRAB_OP_NONE)
     {
-      meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
-                    op, window ? window->desc : "none", display->grab_op,
-                    display->grab_window ? display->grab_window->desc : "none");
+      if (window)
+        meta_warning ("Attempt to perform window operation %u on window %s when operation %u on %s already in effect\n",
+                      op, window->desc, display->grab_op,
+                      display->grab_window ? display->grab_window->desc : "none");
       return FALSE;
     }
 

Modified: trunk/src/core/util.c
==============================================================================
--- trunk/src/core/util.c	(original)
+++ trunk/src/core/util.c	Sun Nov 23 18:53:55 2008
@@ -23,7 +23,7 @@
  */
 
 #define _GNU_SOURCE
-#define _POSIX_C_SOURCE /* for fdopen() */
+#define _POSIX_C_SOURCE 200112L /* for fdopen() */
 
 #include <config.h>
 #include "util.h"