# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: daniel+launchpad@landau.fi-20150414091230-\
#   w8lzbtsffrkoml17
# target_branch: http://bazaar.launchpad.net/~referencer-\
#   devs/referencer/trunk/
# testament_sha1: bf7786657b0ee39526cc0877e0ddc616c642fe27
# timestamp: 2015-04-14 12:12:57 +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-14 09:12:30 +0000
@@ -1,4 +1,4 @@
-
+#include "config.h"
 
 #include <iostream>
 #include <sys/types.h>
@@ -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)
@@ -45,14 +50,14 @@
 		Utility::exceptionDialog (&ex, _("Downloading metadata"));
 		Glib::ustring blank;
 		ret = PyString_FromString (blank.c_str());
-		
+
 	}
 
 	return ret;
 }
 
 /**
- * Convert a bibtex snippet into a dictionary of key/value 
+ * Convert a bibtex snippet into a dictionary of key/value
  * pairs compatible with set_field in PythonDocument
  */
 static PyObject *
@@ -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-14 09:12:30 +0000
@@ -3,12 +3,18 @@
 #ifndef PLUGINMANAGER_H
 #define PLUGINMANAGER_H
 
+#include "config.h"
+
 #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 +53,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-14 09:12:30 +0000
@@ -1,6 +1,8 @@
+#include "config.h"
 
 #include <iostream>
 
+#ifdef ENABLE_PYTHON
 #include <Python.h>
 #include <structmember.h>
 
@@ -217,3 +219,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-14 09:12:30 +0000
@@ -1,4 +1,6 @@
+#include "config.h"
 
+#ifdef ENABLE_PYTHON
 
 #include <iostream>
 
@@ -651,3 +653,5 @@
 	}
 }
 
+#endif
+

=== modified file 'src/main.C'
--- src/main.C	2014-01-13 17:35:16 +0000
+++ src/main.C	2015-04-14 09:12:30 +0000
@@ -8,14 +8,17 @@
  *
  */
 
+#include "config.h"
 
 #include <memory>
 #include <iostream>
 #include <gtkmm.h>
 #include <glibmm/i18n.h>
 
+#ifdef ENABLE_PYTHON
 #include <Python.h>
 #include <PluginManager.h>
+#endif
 
 #include "config.h"
 
@@ -47,12 +50,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 +69,7 @@
 	/* Systemwide */
 	Glib::ustring installedPlugins = PLUGINDIR;
 
+#ifdef ENABLE_PYTHON
 	/* Order is important, defines precedence */
 	pythonPath += ":";
 	pythonPath += localPlugins;
@@ -76,6 +82,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 +105,10 @@
 	}
 
 	delete _global_prefs;
+#ifdef ENABLE_PYTHON
 	delete _global_plugins;
 	Py_Finalize ();
+#endif
 
 	return 0;
 }

# Begin bundle
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
OFCQd+5cSA==