From 4b3a2c5fb0d404a69e6f00e33930d7e559b51c60 Mon Sep 17 00:00:00 2001
From: Tannin <devnull@localhost>
Date: Sat, 17 Aug 2013 08:49:36 +0200
Subject: [PATCH] - plugins that failed to load are now reported as problems -
 some wording fixes in the tutorial - updated proxyPython to a modified
 interface

---
 src/proxy/proxypython.cpp  | 4 ++--
 src/proxy/uibasewrappers.h | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/proxy/proxypython.cpp b/src/proxy/proxypython.cpp
index 5a3567d..06382bb 100644
--- a/src/proxy/proxypython.cpp
+++ b/src/proxy/proxypython.cpp
@@ -1,5 +1,6 @@
 #pragma warning( push )
 #pragma warning( disable : 4100 ) // a lot of unreferenced formal parameters from boost libraries
+#pragma warning( disable : 4996 ) // strncpy claimed to be unsafe
 
 #include "proxypython.h"
 
@@ -711,7 +712,6 @@ QObject *ProxyPython::instantiate(const QString &pluginName)
     bpy::object mobase_module((bpy::handle<>(PyImport_ImportModule("mobase"))));
     main_namespace["sys"] = bpy::import("sys");
     main_namespace["mobase"] = mobase_module;
-
     QString appendDataPath = QString("sys.path.append(\"%1\")").arg(m_MOInfo->pluginDataPath());
 
     bpy::eval(appendDataPath.toUtf8().constData(), main_namespace);
@@ -736,7 +736,7 @@ QObject *ProxyPython::instantiate(const QString &pluginName)
 
 bool ProxyPython::isPythonInstalled() const
 {
-  return Py_IsInitialized();
+  return Py_IsInitialized() != 0;
 }
 
 
diff --git a/src/proxy/uibasewrappers.h b/src/proxy/uibasewrappers.h
index ba75f13..c4f4c4f 100644
--- a/src/proxy/uibasewrappers.h
+++ b/src/proxy/uibasewrappers.h
@@ -136,6 +136,7 @@ struct IOrganizerWrapper: MOBase::IOrganizer, boost::python::wrapper<MOBase::IOr
   virtual QString pluginDataPath() const { return this->get_override("pluginDataPath")(); }
   virtual void installMod(const QString &fileName) { this->get_override("installMod")(fileName); }
   virtual MOBase::IDownloadManager *downloadManager() { return this->get_override("downloadManager")(); }
+  virtual QString resolvePath(const QString &fileName) const { return this->get_override("resolvePath")(fileName); }
 };
 
 struct IDownloadManagerWrapper: MOBase::IDownloadManager, boost::python::wrapper<MOBase::IDownloadManager>