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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/protocols/jabber
From:       Detlev Casanova <detlev.casanova () gmail ! com>
Date:       2009-01-30 20:49:54
Message-ID: 1233348594.579405.26805.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 918846 by casanova:

 * Fix jingle calls GUI and contact registering crash.


 M  +6 -5      jabberaccount.cpp  
 M  +1 -1      jingle/jinglecallsgui.cpp  


--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jabberaccount.cpp #918845:918846
@@ -145,6 +145,7 @@
 
 #ifdef JINGLE_SUPPORT
 	delete m_jcm;
+	m_jcm = 0L;
 #endif
 }
 
@@ -646,9 +647,9 @@
 	{
 			xmppStatus.setIsAvailable( false );
 			kDebug (JABBER_DEBUG_GLOBAL) << "CROSS YOUR FINGERS! THIS IS GONNA BE WILD";
-			disconnect (Manual, xmppStatus);
-            return;
-    }
+			disconnect (Manual, xmppStatus);	
+			return;
+    	}
 
 	if( isConnecting () )
 	{
@@ -760,8 +761,8 @@
 	resourcePool()->clear();
 
 #ifdef JINGLE_SUPPORT
-	if (m_jcm != 0)
-		delete m_jcm;
+	delete m_jcm;
+	m_jcm = 0L;
 #endif
 
 }
--- trunk/KDE/kdenetwork/kopete/protocols/jabber/jingle/jinglecallsgui.cpp #918845:918846
@@ -111,7 +111,7 @@
 {
 	kDebug() << "Terminate session";
 	TreeItem *item = static_cast<TreeItem*>(ui.treeView->currentIndex().internalPointer());
-	if (item == 0 && item->session() == 0)
+	if (item == 0 || item->session() == 0)
 		return;
 	item->session()->jingleSession()->sessionTerminate(); //FIXME:Maybe ask the manager to do that...
 	removeSession(item->session());
[prev in list] [next in list] [prev in thread] [next in thread]