diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:47 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-17 19:03:47 +0000 |
| commit | 22e912f7338ee41bd0f84f4330f4e8bc0c7501d9 (patch) | |
| tree | bd48cdf361c0881f45d09ce46c478ad8674e87c1 /src/iconmgr.c | |
| parent | cfa9fa24253b5ef8045172852509be413d7b00ca (diff) | |
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/iconmgr.c')
| -rw-r--r-- | src/iconmgr.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/iconmgr.c b/src/iconmgr.c index 188495b..f7af30d 100644 --- a/src/iconmgr.c +++ b/src/iconmgr.c @@ -22,6 +22,7 @@ Except as contained in this notice, the name of The Open Group shall not be used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. * */ +/* $XFree86: xc/programs/twm/iconmgr.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ /*********************************************************************** * @@ -32,6 +33,7 @@ in this Software without prior written authorization from The Open Group. * 09-Mar-89 Tom LaStrange File Created * ***********************************************************************/ +/* $XFree86: xc/programs/twm/iconmgr.c,v 1.6 2001/12/14 20:01:08 dawes Exp $ */ #include <stdio.h> #include "twm.h" @@ -491,6 +493,8 @@ WList *AddIconManager(tmp_win) XMapWindow(dpy, ip->twm_win->frame); } + if (Active == NULL) Active = tmp; + return (tmp); } @@ -514,7 +518,8 @@ void InsertInIconManager(ip, tmp, tmp_win) { WList *tmp1; int added; - int (*compar)() = (Scr->CaseSensitive ? strcmp : XmuCompareISOLatin1); + int (*compar)(const char *, const char *) + = (Scr->CaseSensitive ? strcmp : XmuCompareISOLatin1); added = FALSE; if (ip->first == NULL) @@ -663,7 +668,8 @@ void SortIconManager(ip) { WList *tmp1, *tmp2; int done; - int (*compar)() = (Scr->CaseSensitive ? strcmp : XmuCompareISOLatin1); + int (*compar)(const char *, const char *) + = (Scr->CaseSensitive ? strcmp : XmuCompareISOLatin1); if (ip == NULL) ip = Active->iconmgr; |