Skip to content

Commit c467ca7

Browse files
committed
[PR #1438] Xext: panoramiX: drop server reset support
PR: #1438
1 parent d8f2913 commit c467ca7

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Xext/panoramiX.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ static XineramaVisualsEqualProcPtr XineramaVisualsEqualPtr = &VisualsEqual;
9494
* Function prototypes
9595
*/
9696

97-
static x_server_generation_t panoramiXGeneration;
9897
static int ProcPanoramiXDispatch(ClientPtr client);
9998

10099
static void PanoramiXResetProc(ExtensionEntry *);
@@ -446,14 +445,13 @@ PanoramiXExtensionInit(void)
446445
return;
447446
}
448447

449-
while (panoramiXGeneration != serverGeneration) {
450448
extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
451449
ProcPanoramiXDispatch,
452450
ProcPanoramiXDispatch,
453451
PanoramiXResetProc,
454452
StandardMinorOpcode);
455453
if (!extEntry)
456-
break;
454+
return;
457455

458456
/*
459457
* First make sure all the basic allocations succeed. If not,
@@ -488,14 +486,12 @@ PanoramiXExtensionInit(void)
488486
"XineramaColormap");
489487

490488
if (XRT_WINDOW && XRT_PIXMAP && XRT_GC && XRT_COLORMAP) {
491-
panoramiXGeneration = serverGeneration;
492489
success = TRUE;
493490
}
494491
SetResourceTypeErrorValue(XRT_WINDOW, BadWindow);
495492
SetResourceTypeErrorValue(XRT_PIXMAP, BadPixmap);
496493
SetResourceTypeErrorValue(XRT_GC, BadGC);
497494
SetResourceTypeErrorValue(XRT_COLORMAP, BadColor);
498-
}
499495

500496
if (!success) {
501497
noPanoramiXExtension = TRUE;

0 commit comments

Comments
 (0)