summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas James Alexander Thurman <tthurman@src.gnome.org>2008-11-23 18:53:55 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-11-23 18:53:55 +0000
commit41b6f0803e339425166d4a085e7dcad9e13e5e5c (patch)
treec984edf4a379e639d6ff1c99c6d1b3b9747b1242
parent68ac59ff6d11b945ad8f10218f3ade890d5bd861 (diff)
downloadmetacity-41b6f0803e339425166d4a085e7dcad9e13e5e5c.tar.gz
metacity-41b6f0803e339425166d4a085e7dcad9e13e5e5c.tar.bz2
remove apparently spurious warnings about operations on window "none"
* src/core/display.c: remove apparently spurious warnings about operations on window "none" svn path=/trunk/; revision=4026
-rw-r--r--ChangeLog10
-rw-r--r--src/core/display.c7
-rw-r--r--src/core/util.c2
3 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0c4df6f..8387dfb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-11-23 Thomas Thurman <tthurman@gnome.org>
+
+ * src/core/display.c: remove apparently spurious warnings about
+ operations on window "none"
+
+2008-11-23 Thomas Thurman <tthurman@gnome.org>
+
+ * src/core/util.c: Set _POSIX_C_SOURCE to 200112L as it should always
+ have been, in an attempt to close #561962.
+
2008-11-22 Thomas Thurman <tthurman@gnome.org>
* configure.in: Set -ansi so people stop complaining about C99.
diff --git a/src/core/display.c b/src/core/display.c
index 8169541..daac23f 100644
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -3264,9 +3264,10 @@ meta_display_begin_grab_op (MetaDisplay *display,
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;
}
diff --git a/src/core/util.c b/src/core/util.c
index ca7df62..bcfcb7f 100644
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -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"