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

List:       kde-commits
Subject:    branches/work/kopete/dev-0.12/kopete/protocols/jabber
From:       Olivier Goffart <ogoffart () kde ! org>
Date:       2005-12-31 19:02:58
Message-ID: 1136055778.986978.10939.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 492963 by ogoffart:

all compiles here, now

 M  +12 -1     Makefile.am  
 M  +30 -30    jabberaccount.cpp  
 M  +9 -9      jabberaccount.h  
 M  +6 -6      jabbercontact.cpp  


--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/Makefile.am #492962:492963
@@ -35,6 +35,17 @@
 	jabbergroupchatmanager.cpp \
 	jabberfiletransfer.cpp
 
+JINGLE_LIBS= jingle/libkopetejabberjingle.la \
+	jingle/libjingle/talk/session/phone/libcricketsessionphone.la \
+	jingle/libjingle/talk/p2p/client/libcricketp2pclient.la \
+	jingle/libjingle/talk/p2p/base/libcricketp2pbase.la \
+	jingle/libjingle/talk/xmpp/libcricketxmpp.la \
+	jingle/libjingle/talk/xmllite/libcricketxmllite.la \
+	jingle/libjingle/talk/base/libcricketbase.la \
+	jingle/libjingle/talk/third_party/mediastreamer/libmediastreamer.la  \
+	$(EXPAT_LIBS) $(ORTP_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) \
-lasound \ +		 -lexpat -lortp -lspeex -lglib  -lgmodule
+
 kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries)
 kopete_jabber_la_LIBADD  = $(top_builddir)/kopete/libkopete/libkopete.la \
 	ui/libkopetejabberui.la \
@@ -45,7 +56,7 @@
 	libiris/qca/src/libqca.la \
 	libiris/cutestuff/network/libcutestuff_network.la \
 	libiris/cutestuff/util/libcutestuff_util.la \
-	libjabberclient.la 
+	libjabberclient.la   $(JINGLE_LIBS)
 
 service_DATA = kopete_jabber.desktop
 servicedir = $(kde_servicesdir)
--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jabberaccount.cpp \
#492962:492963 @@ -63,11 +63,11 @@
 
 #include <sys/utsname.h>
 
-// #ifndef JABBER_WITHOUT_VOICE
-// #include "jingle/voicecaller.h"
-// #include "jingle/jinglevoicecaller.h"
-// #include "jingle/voicecalldlg.h"
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+#include "jingle/voicecaller.h"
+#include "jingle/jinglevoicecaller.h"
+#include "jingle/voicecalldlg.h"
+#endif
 
 JabberAccount::JabberAccount (JabberProtocol * parent, const QString & accountId, \
const char *name)  :Kopete::PasswordedAccount ( parent, accountId, 0, name )
@@ -81,9 +81,9 @@
 	m_resourcePool = 0L;
 	m_contactPool = 0L;
 	
-// #ifndef JABBER_WITHOUT_VOICE
-// 	m_voiceCaller = 0L;
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+	m_voiceCaller = 0L;
+#endif
 
 	// add our own contact to the pool
 	JabberContact *myContact = contactPool()->addContact ( XMPP::RosterItem ( accountId \
), Kopete::ContactList::self()->myself(), false ); @@ -115,10 +115,10 @@
 	delete m_contactPool;
 	m_contactPool = 0L;
 	
-// #ifndef JABBER_WITHOUT_VOICE
-// 	delete m_voiceCaller;
-// 	m_voiceCaller = 0L;
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+	delete m_voiceCaller;
+	m_voiceCaller = 0L;
+#endif
 
 }
 
@@ -389,14 +389,14 @@
 		case JabberClient::Ok:
 		default:
 			// everything alright!
-// #ifndef JABBER_WITHOUT_VOICE
-// 			if(!m_voiceCaller)
-// 			{
-// 				m_voiceCaller = new JingleVoiceCaller( m_jabberClient );
-// 				QObject::connect(m_voiceCaller,SIGNAL(incoming(const \
                Jid&)),this,SLOT(slotIncomingVoiceCall( const Jid& )));
-// 			}
-// 			m_jabberClient->client()->addExtension("voice-v1", \
                Features(QString("http://www.google.com/xmpp/protocol/voice/v1")));
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+			if(!m_voiceCaller)
+			{
+				m_voiceCaller = new JingleVoiceCaller( m_jabberClient );
+				QObject::connect(m_voiceCaller,SIGNAL(incoming(const \
Jid&)),this,SLOT(slotIncomingVoiceCall( const Jid& ))); +			}
+			m_jabberClient->client()->addExtension("voice-v1", \
Features(QString("http://www.google.com/xmpp/protocol/voice/v1"))); +#endif
 
 			break;
 	}
@@ -519,10 +519,10 @@
 {
 	kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Connected to Jabber server." << \
endl;  
-// #ifndef JABBER_WITHOUT_VOICE
-// 	if(m_voiceCaller)
-// 		m_voiceCaller->initialize();
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+	if(m_voiceCaller)
+		m_voiceCaller->initialize();
+#endif
 
 
 	kdDebug (JABBER_DEBUG_GLOBAL) << k_funcinfo << "Requesting roster..." << endl;
@@ -1501,13 +1501,13 @@
 	dialog->raise ();
 }
 
-void JabberAccount::slotIncomingVoiceCall( const Jid & /*j*/)
+void JabberAccount::slotIncomingVoiceCall( const Jid & j)
 {
-// #ifndef JABBER_WITHOUT_VOICE
-// 	VoiceCallDlg* vc = new VoiceCallDlg(j,voiceCaller());
-// 	vc->show();
-// 	vc->incoming();
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+	VoiceCallDlg* vc = new VoiceCallDlg(j,voiceCaller());
+	vc->show();
+	vc->incoming();
+#endif
 }
 
 #include "jabberaccount.moc"
--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jabberaccount.h \
#492962:492963 @@ -72,12 +72,12 @@
 		return m_jabberClient;
 	}
 	
-// #ifndef JABBER_WITHOUT_VOICE
-// 	VoiceCaller *voiceCaller() const
-// 	{
-// 		return m_voiceCaller;
-// 	}
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+	VoiceCaller *voiceCaller() const
+	{
+		return m_voiceCaller;
+	}
+#endif
 
 	// change the default S5B server port
 	void setS5BServerPort ( int port );
@@ -154,9 +154,9 @@
 
 	JabberResourcePool *m_resourcePool;
 	JabberContactPool *m_contactPool;
-// #ifndef JABBER_WITHOUT_VOICE
-// 	VoiceCaller *m_voiceCaller;
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+	VoiceCaller *m_voiceCaller;
+#endif
 
 	/* Set up our actions for the status menu. */
 	void initActions ();
--- branches/work/kopete/dev-0.12/kopete/protocols/jabber/jabbercontact.cpp \
#492962:492963 @@ -49,9 +49,9 @@
 #include "jabberfiletransfer.h"
 #include "dlgjabbervcard.h"
 
-// #ifndef JABBER_WITHOUT_VOICE
-// #include "jingle/voicecalldlg.h"
-// #endif
+#ifndef JABBER_WITHOUT_VOICE
+#include "jingle/voicecalldlg.h"
+#endif
 
 /**
  * JabberContact constructor
@@ -1322,9 +1322,9 @@
 	}
 #endif
 
-// 	VoiceCallDlg* vc = new VoiceCallDlg(jid,account()->voiceCaller());
-// 	vc->show();
-// 	vc->call();
+	VoiceCallDlg* vc = new VoiceCallDlg(jid,account()->voiceCaller());
+	vc->show();
+	vc->call();
 #endif
 }
 


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