From kde-commits  Sat Dec 31 22:37:52 2005
From: Jakub Stachowski <qbast () go2 ! pl>
Date: Sat, 31 Dec 2005 22:37:52 +0000
To: kde-commits
Subject: KDE/kdenetwork/kopete/kopete
Message-Id: <1136068672.855875.14705.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=113606868007632

SVN commit 492992 by qbast:

Two more crashes



 M  +2 -3      contactlist/kopetecontactlistview.cpp  
 M  +2 -2      systemtray.cpp  


--- trunk/KDE/kdenetwork/kopete/kopete/contactlist/kopetecontactlistview.cpp #492991:492992
@@ -1439,12 +1439,11 @@
 void KopeteContactListView::slotSendMessage()
 {
 	Kopete::MetaContact *m=Kopete::ContactList::self()->selectedMetaContacts().first();
-	Kopete::Group *group = Kopete::ContactList::self()->selectedGroups().first();
 	if(m)
 		m->sendMessage();
 	else
-		if(group)
-			group->sendMessage();
+		if(!Kopete::ContactList::self()->selectedGroups().isEmpty())
+			Kopete::ContactList::self()->selectedGroups().first()->sendMessage();
 }
 
 void KopeteContactListView::slotStartChat()
--- trunk/KDE/kdenetwork/kopete/kopete/systemtray.cpp #492991:492992
@@ -56,7 +56,7 @@
 }
 
 KopeteSystemTray::KopeteSystemTray(QWidget* parent, const char* name)
-	: KSystemTray(parent,name)
+	: KSystemTray(parent,name), mMovie(0)
 {
 //	kdDebug(14010) << "Creating KopeteSystemTray" << endl;
 	QToolTip::add( this, kapp->aboutData()->shortDescription() );
@@ -169,7 +169,7 @@
 
 void KopeteSystemTray::startBlink()
 {
-	if ( mMovie->isNull() )
+	if ( !mMovie )
 		mMovie = new QMovie(KGlobal::iconLoader()->loadMovie( QString::fromLatin1( "newmessage" ), KIcon::Panel ));
 
 	startBlink( mMovie );