| 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
| -rw-r--r-- | kaddressbook/imagewidget.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp index 1e9743c..d0f52ea 100644 --- a/kaddressbook/imagewidget.cpp +++ b/kaddressbook/imagewidget.cpp @@ -227,32 +227,33 @@ void ImageWidget::setLogo( const KABC::Picture &logo ) KABC::Picture ImageWidget::logo() const { KABC::Picture logo; if ( mUseLogoUrl->isChecked() ) logo.setUrl( mLogoUrl->url() ); else { QPixmap *px = mLogoLabel->pixmap(); if ( px ) { #ifndef KAB_EMBEDDED if ( px->height() > px->width() ) logo.setData( px->convertToImage().scaleHeight( 140 ) ); else logo.setData( px->convertToImage().scaleWidth( 100 ) ); #else //KAB_EMBEDDED + if (px->isNull() != true ) logo.setData( px->convertToImage() ); #endif //KAB_EMBEDDED logo.setType( "PNG" ); } } return logo; } void ImageWidget::removePhoto() { setPhoto(KABC::Picture() ); } void ImageWidget::removeLogo() { |