| author | zautrix <zautrix> | 2005-01-18 14:09:00 (UTC) |
|---|---|---|
| committer | zautrix <zautrix> | 2005-01-18 14:09:00 (UTC) |
| commit | ced210b0c4643ddac6a2e80eab4c85c1994b20e0 (patch) (side-by-side diff) | |
| tree | 5126b599b1213553ae71512a400f46d7b2037d92 /kaddressbook/imagewidget.cpp | |
| parent | 4b82a36d1b2479dd2e6f00aef45af848f6793099 (diff) | |
| download | kdepimpi-ced210b0c4643ddac6a2e80eab4c85c1994b20e0.zip kdepimpi-ced210b0c4643ddac6a2e80eab4c85c1994b20e0.tar.gz kdepimpi-ced210b0c4643ddac6a2e80eab4c85c1994b20e0.tar.bz2 | |
ab sync fixes
Diffstat (limited to 'kaddressbook/imagewidget.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | kaddressbook/imagewidget.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
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" ); |