# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: daniel+launchpad@landau.fi-20150413211917-\
#   7mmygya9sanjbxeh
# target_branch: http://bazaar.launchpad.net/~referencer-\
#   devs/referencer/trunk/
# testament_sha1: a98d5f9dfb2f2216ab690e0ffd1cb5d71f4fa34e
# timestamp: 2015-04-14 00:20:02 +0300
# base_revision_id: launchpad@shiyee.dk-20140227102949-\
#   21mgbdqo3yerdwuz
# 
# Begin patch
=== modified file 'src/PluginManager.C'
--- src/PluginManager.C	2012-10-29 00:14:38 +0000
+++ src/PluginManager.C	2015-04-13 21:19:17 +0000
@@ -6,12 +6,16 @@
 
 #include <glibmm/i18n.h>
 
+#ifdef ENABLE_PYTHON
 #include "Python.h"
+#endif
 
 #include "BibData.h"
 #include "Document.h"
 #include "Preferences.h"
+#ifdef ENABLE_PYTHON
 #include "PythonDocument.h"
+#endif
 #include "Transfer.h"
 #include "Utility.h"
 
@@ -25,6 +29,7 @@
 
 static int numargs=0;
 
+#ifdef ENABLE_PYTHON
 /* Return the number of arguments of the application command line */
 static PyObject*
 referencer_download(PyObject *self, PyObject *args)
@@ -153,14 +158,16 @@
 		"Translate a string"},
 	{NULL, NULL, 0, NULL}
 };
-
+#endif
 
 PluginManager::PluginManager ()
 {
+#ifdef ENABLE_PYTHON
 	PyObject *module = Py_InitModule ("referencer", ReferencerMethods);
 
 	PyType_Ready (&t_referencer_document);
 	PyObject_SetAttrString (module, "document", (PyObject*)&t_referencer_document);
+#endif
 
 	progressCallback_ = NULL;
 }
@@ -171,6 +178,7 @@
 
 void PluginManager::scan (std::string const &pluginDir)
 {
+#ifdef ENABLE_PYTHON
 	DIR *dir = opendir (pluginDir.c_str());
 	if (!dir) {
 		// Fail silently, allow the caller to call this
@@ -214,11 +222,13 @@
 		}
 	}
 	closedir (dir);
+#endif
 }
 
 
 Glib::ustring PluginManager::findDataFile (Glib::ustring const file)
 {
+#ifdef ENABLE_PYTHON
 	std::vector<Glib::ustring>::iterator it = pythonPaths_.begin ();
 	std::vector<Glib::ustring>::iterator const end = pythonPaths_.end ();
 	for (; it != end; ++it) {
@@ -235,6 +245,7 @@
 		if (uri->query_exists ())
 			return filename;
 	}
+#endif
 
 	return Glib::ustring ();
 }
@@ -243,11 +254,13 @@
 {
 	PluginList retval;
 
+#ifdef ENABLE_PYTHON
 	std::list<PythonPlugin>::iterator it = pythonPlugins_.begin();
 	std::list<PythonPlugin>::iterator end = pythonPlugins_.end();
 	for (; it != end; ++it) {
 		retval.push_back (&(*it));
 	}
+#endif
 
 	retval.push_back (&crossref_);
 	retval.push_back (&arxiv_);
@@ -259,6 +272,7 @@
 PluginManager::PluginList PluginManager::getEnabledPlugins ()
 {
 	std::list<Plugin*> retval;
+#ifdef ENABLE_PYTHON
 	std::list<PythonPlugin>::iterator it = pythonPlugins_.begin();
 	std::list<PythonPlugin>::iterator end = pythonPlugins_.end();
 
@@ -266,7 +280,8 @@
 		if (it->isEnabled())
 			retval.push_back (&(*it));
 	}
-	
+#endif
+
 	if (arxiv_.isEnabled ())
 		retval.push_back (&arxiv_);
 

=== modified file 'src/PluginManager.h'
--- src/PluginManager.h	2012-10-29 00:14:38 +0000
+++ src/PluginManager.h	2015-04-13 21:19:17 +0000
@@ -5,10 +5,14 @@
 
 #include <string>
 #include <list>
+#ifdef ENABLE_PYTHON
 #include <Python.h>
+#endif
 
 #include "Plugin.h"
+#ifdef ENABLE_PYTHON
 #include "PythonPlugin.h"
+#endif
 #include "CrossRefPlugin.h"
 #include "ArxivPlugin.h"
 
@@ -47,8 +51,10 @@
 		/* Python module search locations */
 		std::vector<Glib::ustring> pythonPaths_;
 
+#ifdef ENABLE_PYTHON
 		/* Loaded python modules */
 		std::list<PythonPlugin> pythonPlugins_;
+#endif
 
 		/* Builtin plugins */
 		CrossRefPlugin crossref_;

=== modified file 'src/Preferences.C'
--- src/Preferences.C	2011-03-21 10:27:19 +0000
+++ src/Preferences.C	2015-04-13 21:19:17 +0000
@@ -137,7 +137,6 @@
 	aboutButton_->signal_clicked().connect (
 		sigc::mem_fun (*this, &Preferences::onPluginAbout));
 
-	
 	// Iterate over all plugins
 	std::list<Plugin*> plugins = _global_plugins->getPlugins();
 	std::list<Plugin*>::iterator pit = plugins.begin();

=== modified file 'src/PythonDocument.C'
--- src/PythonDocument.C	2014-01-26 20:49:45 +0000
+++ src/PythonDocument.C	2015-04-13 21:19:17 +0000
@@ -1,6 +1,7 @@
 
 #include <iostream>
 
+#ifdef ENABLE_PYTHON
 #include <Python.h>
 #include <structmember.h>
 
@@ -217,3 +218,5 @@
 	PyType_GenericNew,
 	_PyObject_Del
 };
+
+#endif

=== modified file 'src/PythonPlugin.C'
--- src/PythonPlugin.C	2012-10-30 06:24:27 +0000
+++ src/PythonPlugin.C	2015-04-13 21:19:17 +0000
@@ -1,4 +1,4 @@
-
+#ifdef ENABLE_PYTHON
 
 #include <iostream>
 
@@ -651,3 +651,5 @@
 	}
 }
 
+#endif
+

=== modified file 'src/main.C'
--- src/main.C	2014-01-13 17:35:16 +0000
+++ src/main.C	2015-04-13 21:19:17 +0000
@@ -14,8 +14,10 @@
 #include <gtkmm.h>
 #include <glibmm/i18n.h>
 
+#ifdef ENABLE_PYTHON
 #include <Python.h>
 #include <PluginManager.h>
+#endif
 
 #include "config.h"
 
@@ -47,12 +49,14 @@
 
 	Gio::init ();
 
+#ifdef ENABLE_PYTHON
 	Glib::ustring pythonPath = "";
 	/* Pick up existing python path */
 	if (getenv("PYTHONPATH")) {
 		pythonPath += ":";
 		pythonPath += getenv("PYTHONPATH");
 	}
+#endif
 
 	/* Locate user plugins */
 	Glib::ustring homePlugins;
@@ -64,6 +68,7 @@
 	/* Systemwide */
 	Glib::ustring installedPlugins = PLUGINDIR;
 
+#ifdef ENABLE_PYTHON
 	/* Order is important, defines precedence */
 	pythonPath += ":";
 	pythonPath += localPlugins;
@@ -76,6 +81,7 @@
 	DEBUG (String::ucompose ("setting pythonPath to %1", pythonPath));
 	setenv ("PYTHONPATH", pythonPath.c_str(), 1);
 	Py_Initialize ();
+#endif
 
 	_global_plugins = new PluginManager ();
 	_global_plugins->scan("./plugins");
@@ -98,8 +104,10 @@
 	}
 
 	delete _global_prefs;
+#ifdef ENABLE_PYTHON
 	delete _global_plugins;
 	Py_Finalize ();
+#endif
 
 	return 0;
 }

# Begin bundle
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
jQMRf/8XckU4UJDwkSbY