2 files changed, 4 insertions, 19 deletions

diff --git a/kaddressbook/imagewidget.cpp b/kaddressbook/imagewidget.cpp
index d0f52ea..eec5e08 100644
--- a/kaddressbook/imagewidget.cpp
+++ b/kaddressbook/imagewidget.cpp
@@ -236,77 +236,62 @@ KABC::Picture ImageWidget::logo() const
     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()
 {
     setLogo(KABC::Picture() );
 }
 
 void ImageWidget::loadPhoto()
 {
   mPhotoLabel->setPixmap( loadPixmap( mPhotoUrl->url() ) );
 }
 
 void ImageWidget::loadLogo()
 {
   mLogoLabel->setPixmap( loadPixmap( mLogoUrl->url() ) );
 }
 
 void ImageWidget::updateGUI()
 {
   KURLRequester *ptr = (KURLRequester*)sender();
 
 
   if ( ptr == mPhotoUrl )
     mUsePhotoUrl->setEnabled( true );
   else if ( ptr == mLogoUrl )
     mUseLogoUrl->setEnabled( true );
 }
 
-QPixmap ImageWidget::loadPixmap( const KURL &url )
+QPixmap ImageWidget::loadPixmap( const QString &url )
 {
-  QString tempFile;
+
   QPixmap pixmap;
 
   if ( url.isEmpty() )
     return pixmap;
-  
-  if ( url.isLocalFile() )
-    pixmap = QPixmap( url.path() );
-  else
-  {
-#ifndef KAB_EMBEDDED
-    if ( KIO::NetAccess::download( url, tempFile ) ) {
-      pixmap = QPixmap( tempFile );
-    KIO::NetAccess::removeTempFile( tempFile );
-    }
-#else //KAB_EMBEDDED
-  qDebug("ImageWidget::loadPixmap : only local pixmaps are allowed");
-#endif //KAB_EMBEDDED
-    
-  }
-
+  pixmap.load( url );
   return pixmap;
 }
 
 #ifndef KAB_EMBEDDED
 #include "imagewidget.moc"
 #endif //KAB_EMBEDDED
diff --git a/kaddressbook/imagewidget.h b/kaddressbook/imagewidget.h
index afb9aa7..bbfba58 100644
--- a/kaddressbook/imagewidget.h
+++ b/kaddressbook/imagewidget.h
@@ -29,60 +29,60 @@
 #include <kabc/picture.h>
 #include <kdialogbase.h>
 
 class KURL;
 class KURLRequester;
 
 class QCheckBox;
 class QLabel;
 
 class ImageWidget : public QWidget
 {
   Q_OBJECT
 
   public:
     ImageWidget( QWidget *parent, const char *name = 0 );
     ~ImageWidget();
 
     /**
       Sets the photo object.
      */
     void setPhoto( const KABC::Picture &photo );
 
     /**
       Returns a photo object.
      */
     KABC::Picture photo() const;
 
     /**
       Sets the logo object.
      */
     void setLogo( const KABC::Picture &photo );
 
     /**
       Returns a logo object.
      */
     KABC::Picture logo() const;
 
   signals:
     void changed();
 
   private slots:
     void loadPhoto();
     void loadLogo();
     void removePhoto();
     void removeLogo();
     void updateGUI();
 
   private:
-    QPixmap loadPixmap( const KURL &url );
+    QPixmap loadPixmap( const QString &url );
 
     KURLRequester *mPhotoUrl;
     KURLRequester *mLogoUrl;
 
     QCheckBox *mUsePhotoUrl;
     QCheckBox *mUseLogoUrl;
     QLabel *mPhotoLabel;
     QLabel *mLogoLabel;
 };
 
 #endif