Azoth VB: kludge for libpurple loading.

0xd34df00d · Feb 28, 2013 · 9afb40d · 9afb40d
1 parent 5f315f8
commit 9afb40d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/plugins/azoth/plugins/velvetbird/velvetbird.cpp b/src/plugins/azoth/plugins/velvetbird/velvetbird.cpp
@@ -27,6 +27,17 @@ namespace VelvetBird
 {
 	void Plugin::Init (ICoreProxy_ptr proxy)
 	{
+		ProtoMgr_ = 0;
+
+		PurpleLib_.setLoadHints (QLibrary::ExportExternalSymbolsHint | QLibrary::ResolveAllSymbolsHint);
+		PurpleLib_.setFileName ("purple");
+		if (!PurpleLib_.load ())
+		{
+			qWarning () << Q_FUNC_INFO
+					<< "unable to re-load libpurple, disabling VelvetBird";
+			return;
+		}
+
 		ProtoMgr_ = new ProtoManager (proxy, this);
 		connect (ProtoMgr_,
 				SIGNAL (gotEntity (LeechCraft::Entity)),
@@ -40,11 +51,13 @@ namespace VelvetBird
 
 	void Plugin::SecondInit ()
 	{
-		ProtoMgr_->PluginsAvailable ();
+		if (ProtoMgr_)
+			ProtoMgr_->PluginsAvailable ();
 	}
 
 	void Plugin::Release ()
 	{
+		PurpleLib_.unload ();
 	}
 
 	QByteArray Plugin::GetUniqueID () const
@@ -82,7 +95,7 @@ namespace VelvetBird
 
 	QList<QObject*> Plugin::GetProtocols () const
 	{
-		return ProtoMgr_->GetProtoObjs ();
+		return ProtoMgr_ ? ProtoMgr_->GetProtoObjs () : QList<QObject*> ();
 	}
 
 	void Plugin::initPlugin (QObject *proxy)

diff --git a/src/plugins/azoth/plugins/velvetbird/velvetbird.h b/src/plugins/azoth/plugins/velvetbird/velvetbird.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <QObject>
+#include <QLibrary>
 #include <interfaces/iinfo.h>
 #include <interfaces/iplugin2.h>
 #include <interfaces/azoth/iprotocolplugin.h>
@@ -39,6 +40,7 @@ namespace VelvetBird
 		Q_OBJECT
 		Q_INTERFACES (IInfo IPlugin2 LeechCraft::Azoth::IProtocolPlugin)
 
+		QLibrary PurpleLib_;
 		ProtoManager *ProtoMgr_;
 	public:
 		void Init (ICoreProxy_ptr);