diff options
| author | Matt Dew <marcoz@osource.org> | 2013-11-05 20:06:28 -0700 |
|---|---|---|
| committer | Matt Dew <marcoz@osource.org> | 2013-11-05 20:06:28 -0700 |
| commit | 833639d2653a869c2ec8692640213e2ffa16fbb4 (patch) | |
| tree | 0af98caa19da2d6930a79f87bfa68181b31a05b8 | |
| parent | cf684f05180e8b3eb29ca94bbab84abb99f0f578 (diff) | |
| parent | 94b7f26aeda31cf55ff9b7c04f390ba6d35977e4 (diff) | |
Merge commit '94b7f26aeda31cf55ff9b7c04f390ba6d35977e4' into server-1.14-branch
| -rw-r--r-- | hw/xquartz/bundle/Info.plist.cpp | 4 | ||||
| -rw-r--r-- | miext/damage/damage.c | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp index b0106c6da..905952a68 100644 --- a/hw/xquartz/bundle/Info.plist.cpp +++ b/hw/xquartz/bundle/Info.plist.cpp @@ -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> diff --git a/miext/damage/damage.c b/miext/damage/damage.c index a98c20ec0..3dc3180f3 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -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); } |