external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-15 04:32:24 +00:00
Code Issues Releases Wiki Activity

dtsession/SrvPalette.c: fix bogus error handling when selection is lost

Browse source
This commit is contained in:
Jon Trulson 2019-12-03 17:10:35 -07:00
parent 48dd0a54f3
commit eb986d8018
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cde/programs/dtsession/SrvPalette.c
View file

@ -564,6 +564,7 @@ CheckMonitor(
XInternAtom(dpy, cust_msg, FALSE); XInternAtom(dpy, cust_msg, FALSE);
/* go set ownership of the pixel set atoms */ /* go set ownership of the pixel set atoms */
sleep(5);
result = XtOwnSelection(shell[screen_number], result = XtOwnSelection(shell[screen_number],
colorSrv.XA_CUSTOMIZE[screen_number], colorSrv.XA_CUSTOMIZE[screen_number],
CurrentTime, convert_selection, CurrentTime, convert_selection,
@ -804,15 +805,19 @@ lose_selection(
pixel_set_atom = XInternAtom(XtDisplay(w), XmSPIXEL_SET_PROP, FALSE) ; pixel_set_atom = XInternAtom(XtDisplay(w), XmSPIXEL_SET_PROP, FALSE) ;
XDeleteProperty(XtDisplay(w), XtWindow(shell[0]), pixel_set_atom) ; XDeleteProperty(XtDisplay(w), XtWindow(shell[0]), pixel_set_atom) ;
tmpStr = (char *)SRV_MALLOC(strlen(MSG2) + strlen(MSG2a) + 6);
tmpStr2 = (char *)SRV_MALLOC(strlen(MSG2) + 1);
if (selection != NULL) { if (selection != NULL) {
tmpStr3 = XGetAtomName(XtDisplay(w), *selection); tmpStr3 = XGetAtomName(XtDisplay(w), *selection);
} else { } else {
tmpStr3 = NULL; tmpStr3 = "(null)";
} }
printf(tmpStr2,"%s", MSG2);
sprintf(tmpStr,"%s%s%s", tmpStr2, (tmpStr3 == NULL) ? "(null)" : tmpStr3, MSG2a); const int str1len = strlen(MSG2) + strlen(MSG2a) + strlen(tmpStr3) + 10;
const int str2len = strlen(MSG2) + 1;
tmpStr = (char *)SRV_MALLOC(str1len);
tmpStr2 = (char *)SRV_MALLOC(str2len);
snprintf(tmpStr2, str2len, "%s", MSG2);
snprintf(tmpStr, str1len, "%s %s\n%s", tmpStr2, tmpStr3, MSG2a);
_DtSimpleError(XmSCOLOR_SRV_NAME, DtWarning, NULL, tmpStr, NULL); _DtSimpleError(XmSCOLOR_SRV_NAME, DtWarning, NULL, tmpStr, NULL);
SRV_FREE(tmpStr); SRV_FREE(tmpStr);
SRV_FREE(tmpStr2); SRV_FREE(tmpStr2);