Enlightenment CVS committal
Author : mej
Project : eterm
Module : Eterm
Dir : eterm/Eterm/src
Modified Files:
feature.h pixmap.c term.c
Log Message:
Wed Jul 14 16:16:48 2004 Michael Jennings (mej)
Applied patch from Kim Woelders <[EMAIL PROTECTED]> to fix setting of
_NET_WM_ICON property.
Fixed a couple warnings.
----------------------------------------------------------------------
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/feature.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- feature.h 28 Jun 2004 16:36:57 -0000 1.41
+++ feature.h 14 Jul 2004 20:18:29 -0000 1.42
@@ -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
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/pixmap.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- pixmap.c 11 Jan 2004 22:10:29 -0000 1.102
+++ pixmap.c 14 Jul 2004 20:18:29 -0000 1.103
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: pixmap.c,v 1.102 2004/01/11 22:10:29 mej Exp $";
+static const char cvs_ident[] = "$Id: pixmap.c,v 1.103 2004/07/14 20:18:29 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -2212,9 +2212,10 @@
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 */
===================================================================
RCS file: /cvsroot/enlightenment/eterm/Eterm/src/term.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -3 -r1.103 -r1.104
--- term.c 20 Apr 2004 19:41:38 -0000 1.103
+++ term.c 14 Jul 2004 20:18:30 -0000 1.104
@@ -21,7 +21,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
-static const char cvs_ident[] = "$Id: term.c,v 1.103 2004/04/20 19:41:38 mej Exp $";
+static const char cvs_ident[] = "$Id: term.c,v 1.104 2004/07/14 20:18:30 mej Exp $";
#include "config.h"
#include "feature.h"
@@ -1324,7 +1324,10 @@
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;
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs