fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-04-21 07:40:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge commit '94b7f26aeda31cf55ff9b7c04f390ba6d35977e4' into server-1.14-branch

Browse source
This commit is contained in:
Matt Dew 2013-11-05 20:06:28 -07:00
commit 833639d265
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
hw/xquartz/bundle/Info.plist.cpp
View file

@ -19,9 +19,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.7.4</string>
<string>2.7.5</string>
<key>CFBundleVersion</key>
<string>2.7.4</string>
<string>2.7.5</string>
<key>CFBundleSignature</key>
<string>x11a</string>
<key>CSResourcesFileMapped</key>

5
miext/damage/damage.c
View file

@ -439,10 +439,7 @@ damageValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
drawableDamage(pDrawable);
DAMAGE_GC_FUNC_PROLOGUE(pGC);
(*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
if (pDamage)
pGCPriv->ops = pGC->ops; /* so it's not NULL, so FUNC_EPILOGUE does work */
else
pGCPriv->ops = NULL;
pGCPriv->ops = pGC->ops; /* just so it's not NULL */
DAMAGE_GC_FUNC_EPILOGUE(pGC);
}