diff options
| -rw-r--r-- | choose.c | 12 | ||||
| -rw-r--r-- | prop.c | 6 | ||||
| -rw-r--r-- | xsm.c | 2 |
3 files changed, 12 insertions, 8 deletions
@@ -23,7 +23,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/xsm/choose.c,v 1.5 2001/12/14 20:02:24 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/choose.c,v 1.7 2003/07/20 16:12:21 tsi Exp $ */ #include "xsm.h" #include "saveutil.h" @@ -144,7 +144,12 @@ GetSessionNames(int *count_ret, String **short_names_ret, else { char *host = ((char *) strchr (id, '/')) + 1; - char *colon = (char *) strchr (host, ':'); + char *colon = (char *) strrchr (host, ':'); + + /* backtrack over previous colon if there are 2 (DECnet), + but not three (IPv6) */ + if ((*(colon - 1) == ':') && (*(colon - 2) != ':')) + colon--; *colon = '\0'; @@ -584,7 +589,6 @@ ChooseSessionBreakLockXtProc(Widget w, XtPointer client_data, } else { - char *id; int longest; XtVaSetValues (chooseSessionMessageLabel, @@ -593,7 +597,7 @@ ChooseSessionBreakLockXtProc(Widget w, XtPointer client_data, name = sessionNamesShort[current->list_index]; - id = GetLockId (name); + (void) GetLockId (name); UnlockSession (name); @@ -23,7 +23,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/xsm/prop.c,v 1.5 2001/12/14 20:02:26 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/prop.c,v 1.6 2003/03/26 20:44:00 tsi Exp $ */ #include "xsm.h" #include "info.h" @@ -191,7 +191,7 @@ SetProperty(ClientRec *client, SmProp *theProp, Bool freeIt) if (client->saveDiscardCommand) XtFree (client->saveDiscardCommand); client->saveDiscardCommand = - (char *) XtNewString (theProp->vals[0].value); + (char *) XtNewString ((char *) theProp->vals[0].value); client->receivedDiscardCommand = True; } @@ -200,7 +200,7 @@ SetProperty(ClientRec *client, SmProp *theProp, Bool freeIt) if (client->discardCommand) XtFree (client->discardCommand); client->discardCommand = - (char *) XtNewString (theProp->vals[0].value); + (char *) XtNewString ((char *) theProp->vals[0].value); } } else if (strcmp (theProp->name, SmRestartStyleHint) == 0) @@ -23,7 +23,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/xsm/xsm.c,v 1.9 2001/12/14 20:02:27 dawes Exp $ */ +/* $XFree86: xc/programs/xsm/xsm.c,v 1.10 2003/09/13 21:33:12 dawes Exp $ */ /* * X Session Manager. |