Stopgap to make psi less broken without psimedia plugin.

psi-im · Apr 6, 2009 · 2640838 · 2640838
1 parent f1fa04e
commit 2640838
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/contactview.cpp b/src/contactview.cpp
@@ -61,6 +61,10 @@
 #include "bookmarkmanagedlg.h"
 #include "bookmarkmanager.h"
 
+#ifdef AVCALL
+#include "../psimedia/psimedia.h"
+#endif
+
 static inline int rankStatus(int status) 
 {
 	switch (status) {
@@ -1252,7 +1256,7 @@ void ContactProfile::doContextMenu(ContactViewItem *i, const QPoint &pos)
 
 		// Voice call
 #ifdef AVCALL
-		if(!isAgent) {
+		if(!isAgent && PsiMedia::isSupported()) {
 #else
 		if(d->pa->voiceCaller() && !isAgent) {
 #endif

diff --git a/src/mainwin.cpp b/src/mainwin.cpp
@@ -38,6 +38,7 @@
 #include <QtAlgorithms>
 
 #ifdef AVCALL
+#include "../psimedia/psimedia.h"
 #include <QShortcut>
 #endif
 
@@ -1404,7 +1405,7 @@ void MainWin::showNoFocus()
 void MainWin::avcallConfig()
 {
 #ifdef AVCALL
-	JingleRtpManager::config();
+	if (PsiMedia::isSupported()) JingleRtpManager::config();
 #endif
 }
 

diff --git a/src/psiaccount.cpp b/src/psiaccount.cpp
@@ -128,6 +128,7 @@
 #include "Certificates/CertificateDisplayDialog.h"
 
 #ifdef AVCALL
+#include "../psimedia/psimedia.h"
 #include "avcall/jinglertp.h"
 #include "avcall/calldlg.h"
 #endif
@@ -873,7 +874,7 @@ PsiAccount::PsiAccount(const UserAccount &acc, PsiContactList *parent, CapsRegis
 #ifdef AVCALL
 	d->jingleRtpManager = new JingleRtpManager(this);
 	connect(d->jingleRtpManager, SIGNAL(incomingReady()), d, SLOT(incoming_call()));
-	{
+	if (PsiMedia::isSupported()) {
 		QStringList features;
 		features << "urn:xmpp:jingle:0";
 		features << "urn:xmpp:jingle:apps:rtp:1";
@@ -3054,6 +3055,7 @@ void PsiAccount::changeStatus(int x)
 void PsiAccount::actionVoice(const Jid &j)
 {
 #ifdef AVCALL
+	if (!PsiMedia::isSupported()) return;
 	Jid j2 = j;
 	if(j.resource().isEmpty()) {
 		UserListItem *u = find(j);