From 2e224288a7fd102a069cdbb2f85bc71a7f9a60ef Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Wed, 12 Nov 2008 01:19:27 +0000
Subject: fix [Bug 2265860] new test failures

---
 ChangeLog            | 4 ++++
 generic/tkImgPhoto.c | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eaf9fbc..b271108 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-11  Jan Nijtmans  <nijtmans@users.sf.net>
+
+	* generic/tkImgPhoto.c    Fix [Bug 2265860] new test failures
+
 2008-11-11  Joe English  <jenglish@users.sourceforge.net>
 
 	* generic/ttk/ttkWidget.c(BeginDrawing): Don't crash when 
diff --git a/generic/tkImgPhoto.c b/generic/tkImgPhoto.c
index 6213472..44a63fe 100644
--- a/generic/tkImgPhoto.c
+++ b/generic/tkImgPhoto.c
@@ -17,7 +17,7 @@
  *	   Department of Computer Science,
  *	   Australian National University.
  *
- * RCS: @(#) $Id: tkImgPhoto.c,v 1.86 2008/11/12 00:15:26 nijtmans Exp $
+ * RCS: @(#) $Id: tkImgPhoto.c,v 1.87 2008/11/12 01:19:27 nijtmans Exp $
  */
 
 #include "tkImgPhoto.h"
@@ -2522,7 +2522,7 @@ Tk_FindPhoto(
     ClientData clientData =
 	    Tk_GetImageMasterData(interp, imageName, &typePtr);
 
-    if (typePtr != &tkPhotoImageType) {
+    if ((typePtr == NULL) || (typePtr->name != tkPhotoImageType.name)) {
 	return NULL;
     }
     return clientData;
-- 
cgit v0.12