[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kdenetwork/kopete/kopete/config/avdevice
From:       Matthias Granberry <matthias.granberry () gmail ! com>
Date:       2005-10-06 0:34:32
Message-ID: 1128558872.422578.7240.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 467702 by granberry:

Fix bug 111733.  Take a look at this because I'm not positive what's
supposed to happen when there isn't a webcam present.
BUG:111733
CC:thaupter@gmail.com


 M  +5 -4      avdeviceconfig.cpp  


--- branches/KDE/3.5/kdenetwork/kopete/kopete/config/avdevice/avdeviceconfig.cpp \
#467701:467702 @@ -1,7 +1,7 @@
 /*
     avdeviceconfig.cpp  -  Kopete Video Device Configuration Panel
 
-    Copyright (c) 2005 by Cláudio da Silveira Pinheiro   <taupter@gmail.com>
+    Copyright (c) 2005 by Cl�dio da Silveira Pinheiro   <taupter@gmail.com>
 
     Kopete    (c) 2002-2003      by the Kopete developers  <kopete-devel@kde.org>
 
@@ -62,7 +62,8 @@
 	connect(mPrfsVideoDevice->mImageAutoAdjustBrightnessContrast, \
SIGNAL(toggled(bool)),     this, \
SLOT(slotImageAutoAdjustBrightnessContrastChanged(bool)));  \
connect(mPrfsVideoDevice->mImageAutoColorCorrection,          SIGNAL(toggled(bool)),  \
this, SLOT(slotImageAutoColorCorrectionChanged(bool)));  
-	mPrfsVideoDevice->mVideoImageLabel->setPixmap(qpixmap);
+	// why is this here?
+	// mPrfsVideoDevice->mVideoImageLabel->setPixmap(qpixmap);
 	mAVDeviceTabCtl->addTab(mPrfsVideoDevice, i18n("&Video"));
 	d = Kopete::AV::VideoDevicePool::self();
 	d->scanDevices();
@@ -74,8 +75,8 @@
 	d->startCapturing();
 	d->getFrame();
 	d->getImage(&qimage);
-	qpixmap.convertFromImage(qimage,0);
-	mPrfsVideoDevice->mVideoImageLabel->setPixmap(qpixmap);
+	if (qpixmap.convertFromImage(qimage,0) == true)
+		mPrfsVideoDevice->mVideoImageLabel->setPixmap(qpixmap);
 	connect(&qtimer, SIGNAL(timeout()), this, SLOT(slotUpdateImage()) );
 	qtimer.start(500,FALSE);
 }


[prev in list] [next in list] [prev in thread] [next in thread]