From ced210b0c4643ddac6a2e80eab4c85c1994b20e0 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Tue, 18 Jan 2005 14:09:00 +0000
Subject: ab sync fixes

---
(limited to 'kaddressbook/imagewidget.cpp')

diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index 1e9743c..d0f52ea 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -239,8 +239,9 @@ KABC::Picture ImageWidget::logo() const
         logo.setData( px->convertToImage().scaleHeight( 140 ) );
       else
         logo.setData( px->convertToImage().scaleWidth( 100 ) );
-#else //KAB_EMBEDDED  
-      logo.setData( px->convertToImage() );
+#else //KAB_EMBEDDED     
+      if (px->isNull() != true ) 
+          logo.setData( px->convertToImage() );
 #endif //KAB_EMBEDDED  
 
       logo.setType( "PNG" );
--
cgit v0.9.0.2