From 59fdf48d0c174beaa07513d24b6c923ac955e4cd Mon Sep 17 00:00:00 2001 From: William McBrine Date: Wed, 15 Feb 2006 07:46:36 +0000 Subject: [PATCH] The default icon was broken since the addition of XPM support (May '03). This fixes it for 2.7. Now to figure out how _I_ broke it in pre-2.8. --- x11/process/x11.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/x11/process/x11.c b/x11/process/x11.c index a14f4b53..8283db12 100644 --- a/x11/process/x11.c +++ b/x11/process/x11.c @@ -25,7 +25,7 @@ #ifdef PDCDEBUG const char rcsid_x11 = - "$Id: x11.c,v 1.32 2006/02/04 20:40:27 wmcbrine Exp $"; + "$Id: x11.c,v 1.33 2006/02/15 07:46:36 wmcbrine Exp $"; #endif extern AppData app_data; @@ -590,7 +590,7 @@ int XCursesSetupX(char *display_name, int argc, char *argv[]) XCursesGetIcon(); #ifdef HAVE_XPM_H - if (XCURSESPIXMAPFILE != NULL) + if (XCURSESPIXMAPFILE != NULL && strcmp(XCURSESPIXMAPFILE, "") != 0) XtVaSetValues(topLevel, XtNminWidth, minwidth, XtNminHeight, minheight, XtNiconPixmap, icon_pixmap, XtNiconMask, icon_pixmap_mask, NULL);