Wed Jul 14 16:16:48 2004 Michael Jennings (mej)

Applied patch from Kim Woelders <kim@woelders.dk> to fix setting of
_NET_WM_ICON property.

Fixed a couple warnings.
----------------------------------------------------------------------


SVN revision: 10834

4 files changed, 22 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0dd1884..33f3cf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5229,3 +5229,10 @@ Mon Jun 28 12:34:36 2004                        Michael Jennings (mej)
 
 Cleaning up some warnings.
 ----------------------------------------------------------------------
+Wed Jul 14 16:16:48 2004                        Michael Jennings (mej)
+
+Applied patch from Kim Woelders <kim@woelders.dk> to fix setting of
+_NET_WM_ICON property.
+
+Fixed a couple warnings.
+----------------------------------------------------------------------
diff --git a/src/feature.h b/src/feature.h
index cc9adfa..4827ce0 100644
--- a/src/feature.h
+++ b/src/feature.h
@@ -53,6 +53,13 @@
 #  undef HAVE_SYS_IOCTL_H
 # endif
 
+# ifdef __GNUC__
+#  define _GNU_SOURCE
+# else
+#  define _XOPEN_SOURCE 600
+#  define _XOPEN_SOURCE_EXTENDED 1
+# endif
+
 /********************* Debugging stuff *********************/
 /* As Keith Bunge would say, don't crap with the debugging stuff below
  * unless you develop this mess. :^)   -- mej
diff --git a/src/pixmap.c b/src/pixmap.c
index 3889627..a7b785f 100644
--- a/src/pixmap.c
+++ b/src/pixmap.c
@@ -2212,9 +2212,10 @@ set_icon_pixmap(char *filename, XWMHints * pwm_hints)
     wm_hints->flags |= IconPixmapHint | IconMaskHint;
 #endif
 
-    /* Set the EWMH icon hint for stupid GNOME WM's. */
-    XChangeProperty(Xdisplay, TermWin.parent, props[PROP_EWMH_ICON], XA_CARDINAL, 32, PropModeReplace, (unsigned char *) icon_data, sizeof(icon_data));
-
+    /* Set the EWMH icon hint for _NET_WM-compliant GNOME WM's. */
+    XChangeProperty(Xdisplay, TermWin.parent,
+                    props[PROP_EWMH_ICON], XA_CARDINAL, 32, PropModeReplace,
+                    (unsigned char *) icon_data, sizeof(icon_data) / sizeof(CARD32));
     imlib_free_image_and_decache();
 
     /* Only set the hints ourselves if we were passed a NULL pointer for pwm_hints */
diff --git a/src/term.c b/src/term.c
index 3b89bc1..a3f4672 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1324,7 +1324,10 @@ process_window_mode(unsigned int nargs, int args[])
     Window dummy_child;
     int dummy_x, dummy_y;
     unsigned int dummy_border, dummy_depth;
-    char buff[1024], *name;
+    char buff[1024];
+#ifdef ENABLE_NAME_REPORTING_ESCAPES
+    char *name;
+#endif
 
     if (!nargs)
         return;