gpy-gpgpy-after-backports.diff

Only in geanypy: aclocal.m4
Only in geany-plugins/geanypy: AUTHORS
Only in geanypy: autogen.sh
Only in geanypy: autom4te.cache
Only in geanypy: build-aux
Only in geany-plugins/geanypy: ChangeLog
Only in geanypy: config.log
Only in geanypy: config.status
Only in geanypy: configure
Only in geanypy: configure.ac
Only in geany-plugins/geanypy: doc
Only in geanypy: docs
Only in geanypy/geany: console.pyc
diff -bur geanypy/geany/__init__.py geany-plugins/geanypy/geany/__init__.py
--- geanypy/geany/__init__.py	2017-02-16 19:53:00.106243600 -0800
+++ geany-plugins/geanypy/geany/__init__.py	2017-02-16 19:53:28.824760700 -0800
@@ -15,7 +15,6 @@
 import encoding
 import filetypes
 import highlighting
-import glog
 import main
 import msgwindow
 import navqueue
@@ -43,7 +42,6 @@
             "main_widgets",
             "interface_prefs",
             "app",
-            "glog",
             "keybindings",
             "general_prefs",
             "search_prefs",
Only in geanypy/geany: __init__.pyc
Only in geanypy/geany: logger.py
Only in geanypy/geany: logger.pyc
Only in geanypy/geany: Makefile
diff -bur geanypy/geany/Makefile.am geany-plugins/geanypy/geany/Makefile.am
--- geanypy/geany/Makefile.am	2017-02-16 19:53:00.105824500 -0800
+++ geany-plugins/geanypy/geany/Makefile.am	2017-02-16 19:53:28.824426000 -0800
@@ -1,6 +1,5 @@
 geanypy_sources				=	__init__.py \
 								console.py \
-								logger.py \
 								plugin.py \
 								signalmanager.py
 geanypy_objects				=	$(geanypy_sources:.py=.pyc)
Only in geanypy/geany: Makefile.in
diff -bur geanypy/geany/plugin.py geany-plugins/geanypy/geany/plugin.py
--- geanypy/geany/plugin.py	2017-02-16 21:05:28.787910800 -0800
+++ geany-plugins/geanypy/geany/plugin.py	2017-02-16 19:53:28.825643500 -0800
@@ -35,8 +35,6 @@
 ~/.config/geany/plugins).  Only files with a `.py` extension will be loaded.
 """
 
-
-from geany.logger import PluginLogger
 import keybindings
 
 class Plugin(object):
@@ -62,7 +60,7 @@
 		When the plugin is loaded its __init__() function will be called
 		so that's a good place to put plugin initialization code.
 		"""
-		self.logger = PluginLogger(self.name)
+
 
 
 	def cleanup(self):
Only in geanypy/geany: plugin.pyc
Only in geanypy/geany: signalmanager.pyc
Only in geanypy: geanypy.nsi
Only in geanypy: .git
Only in geanypy: .gitignore
Only in geanypy: libtool
Only in geanypy/m4: libtool.m4
Only in geanypy/m4: lt~obsolete.m4
Only in geanypy/m4: ltoptions.m4
Only in geanypy/m4: ltsugar.m4
Only in geanypy/m4: ltversion.m4
Only in geanypy: Makefile
diff -bur geanypy/Makefile.am geany-plugins/geanypy/Makefile.am
--- geanypy/Makefile.am	2017-02-16 19:53:00.097251600 -0800
+++ geany-plugins/geanypy/Makefile.am	2017-02-16 19:53:28.818652800 -0800
@@ -1,2 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4
+include $(top_srcdir)/build/vars.auxfiles.mk
+#ACLOCAL_AMFLAGS += -I geanypy/m4
 SUBDIRS = src geany plugins
+plugin = geanypy
Only in geanypy: Makefile.in
Only in geanypy: makefile.win32
Only in geany-plugins/geanypy: NEWS
Only in geanypy/plugins: Makefile
Only in geanypy/plugins: Makefile.in
Only in geany-plugins/geanypy: README
Only in geanypy: README.markdown
Only in geanypy: README.win32
Only in geanypy/src: config.h
Only in geanypy/src: config.h.in
Only in geanypy/src: config.h.in~
Only in geanypy/src: .deps
diff -bur geanypy/src/geanypy-app.c geany-plugins/geanypy/src/geanypy-app.c
--- geanypy/src/geanypy-app.c	2017-02-16 21:05:28.789965600 -0800
+++ geany-plugins/geanypy/src/geanypy-app.c	2017-02-16 19:53:28.829331800 -0800
@@ -4,6 +4,7 @@
 
 #include "geanypy.h"
 
+
 typedef struct
 {
 	PyObject_HEAD
diff -bur geanypy/src/geanypy-document.c geany-plugins/geanypy/src/geanypy-document.c
--- geanypy/src/geanypy-document.c	2017-02-16 21:05:28.792172400 -0800
+++ geany-plugins/geanypy/src/geanypy-document.c	2017-02-16 19:53:28.830123500 -0800
@@ -118,9 +118,9 @@
 	else if (g_str_equal(prop_name, "text_changed"))
 	{
 		if (self->doc->changed)
-			Py_RETURN_TRUE;
+			Py_RETURN_NONE;
 		else
-			Py_RETURN_FALSE;
+			Py_RETURN_NONE;
 	}
 
 	Py_RETURN_NONE;
diff -bur geanypy/src/geanypy-editor.c geany-plugins/geanypy/src/geanypy-editor.c
--- geanypy/src/geanypy-editor.c	2017-02-16 21:05:28.793373700 -0800
+++ geany-plugins/geanypy/src/geanypy-editor.c	2017-02-16 19:53:28.830923900 -0800
@@ -62,7 +62,7 @@
 		PyObject *py_doc;
 		py_doc = (PyObject *) Document_create_new_from_geany_document(
 									self->editor->document);
-		if (!py_doc || py_doc == Py_None)
+		if (py_doc && py_doc != Py_None)
 			Py_RETURN_NONE;
 		return py_doc;
 	}
@@ -296,7 +296,7 @@
 	{ "indicator_set_on_range", (PyCFunction) Editor_indicator_set_on_range, METH_KEYWORDS,
 		"Sets an indicator on the range specified." },
 	{ "insert_snippet", (PyCFunction) Editor_insert_snippet, METH_KEYWORDS,
-		"Replaces all special sequences in snippet and inserts it at "
+		"Replces all special sequences in snippet and inserts it at "
 		"the specified position." },
 	{ "insert_text_block", (PyCFunction) Editor_insert_text_block, METH_KEYWORDS,
 		"Inserts text, replacing tab chars and newline chars accordingly "
Only in geanypy/src: geanypy-glog.c
Only in geanypy/src: geanypy.la
Only in geanypy/src: geanypy_la-geanypy-app.lo
Only in geanypy/src: geanypy_la-geanypy-dialogs.lo
Only in geanypy/src: geanypy_la-geanypy-document.lo
Only in geanypy/src: geanypy_la-geanypy-editor.lo
Only in geanypy/src: geanypy_la-geanypy-encoding.lo
Only in geanypy/src: geanypy_la-geanypy-filetypes.lo
Only in geanypy/src: geanypy_la-geanypy-glog.lo
Only in geanypy/src: geanypy_la-geanypy-highlighting.lo
Only in geanypy/src: geanypy_la-geanypy-indentprefs.lo
Only in geanypy/src: geanypy_la-geanypy-interfaceprefs.lo
Only in geanypy/src: geanypy_la-geanypy-keybindings.lo
Only in geanypy/src: geanypy_la-geanypy-main.lo
Only in geanypy/src: geanypy_la-geanypy-mainwidgets.lo
Only in geanypy/src: geanypy_la-geanypy-msgwindow.lo
Only in geanypy/src: geanypy_la-geanypy-navqueue.lo
Only in geanypy/src: geanypy_la-geanypy-plugin.lo
Only in geanypy/src: geanypy_la-geanypy-prefs.lo
Only in geanypy/src: geanypy_la-geanypy-project.lo
Only in geanypy/src: geanypy_la-geanypy-scinotification.lo
Only in geanypy/src: geanypy_la-geanypy-scinotifyheader.lo
Only in geanypy/src: geanypy_la-geanypy-scintilla.lo
Only in geanypy/src: geanypy_la-geanypy-search.lo
Only in geanypy/src: geanypy_la-geanypy-signalmanager.lo
Only in geanypy/src: geanypy_la-geanypy-templates.lo
Only in geanypy/src: geanypy_la-geanypy-uiutils.lo
diff -bur geanypy/src/geanypy-plugin.c geany-plugins/geanypy/src/geanypy-plugin.c
--- geanypy/src/geanypy-plugin.c	2017-02-16 21:05:28.807159000 -0800
+++ geany-plugins/geanypy/src/geanypy-plugin.c	2017-02-16 19:53:28.836380900 -0800
@@ -40,7 +40,6 @@
 PyMODINIT_FUNC initeditor(void);
 PyMODINIT_FUNC initencoding(void);
 PyMODINIT_FUNC initfiletypes(void);
-PyMODINIT_FUNC initglog(void);
 PyMODINIT_FUNC inithighlighting(void);
 PyMODINIT_FUNC initmain(void);
 PyMODINIT_FUNC initmsgwin(void);
@@ -82,7 +81,6 @@
     initeditor();
     initencoding();
     initfiletypes();
-    initglog();
     inithighlighting();
     initmain();
     initmsgwin();
Only in geanypy/src: .libs
Only in geanypy/src: Makefile
diff -bur geanypy/src/Makefile.am geany-plugins/geanypy/src/Makefile.am
--- geanypy/src/Makefile.am	2017-02-16 21:05:28.788993900 -0800
+++ geany-plugins/geanypy/src/Makefile.am	2017-02-16 19:53:28.828959800 -0800
@@ -1,12 +1,15 @@
+include $(top_srcdir)/build/vars.build.mk
+plugin = geanypy
+
 geanyplugin_LTLIBRARIES		=	geanypy.la
 geanyplugindir				=	$(libdir)/geany
 
 geanypy_la_LDFLAGS			=	-module -avoid-version -Wl,--export-dynamic
-geanypy_la_CPPFLAGS			=	@PYTHON_CPPFLAGS@ \
+geanypy_la_CPPFLAGS			=	@GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \
 								-DGEANYPY_PYTHON_DIR="\"$(libdir)/geany/geanypy\"" \
 								-DGEANYPY_PLUGIN_DIR="\"$(libdir)/geany\"" \
 								-DG_LOG_DOMAIN=\"GeanyPy\"
-geanypy_la_CFLAGS			=	@PYGTK_CFLAGS@ @GEANY_CFLAGS@ @GMODULE_CFLAGS@
+geanypy_la_CFLAGS			=	@GEANYPY_CFLAGS@ @GMODULE_CFLAGS@
 geanypy_la_LIBADD			=	@GEANY_LIBS@ @PYGTK_LIBS@ \
 								$(PYTHON_LDFLAGS) $(PYTHON_LIBS) \
 								@PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ \
@@ -17,12 +20,11 @@
 								geanypy-editor.c geanypy-editor.h \
 								geanypy-encoding.c geanypy-encoding.h \
 								geanypy-filetypes.c geanypy-filetypes.h \
-								geanypy-glog.c \
 								geanypy.h \
 								geanypy-highlighting.c \
 								geanypy-indentprefs.c \
 								geanypy-interfaceprefs.c \
-								geanypy-keybindings.c geanypy-keybindings.h \
+								geanypy-keybindings.c geanypy-keybindings.h\
 								geanypy-main.c \
 								geanypy-mainwidgets.c \
 								geanypy-msgwindow.c \
@@ -37,3 +39,5 @@
 								geanypy-signalmanager.c geanypy-signalmanager.h \
 								geanypy-templates.c \
 								geanypy-uiutils.c geanypy-uiutils.h
+
+include $(top_srcdir)/build/cppcheck.mk
Only in geanypy/src: Makefile.in
diff -bur geanypy/src/makefile.win32 geany-plugins/geanypy/src/makefile.win32
--- geanypy/src/makefile.win32	2017-02-16 19:53:00.125670300 -0800
+++ geany-plugins/geanypy/src/makefile.win32	2017-02-16 19:53:28.842240400 -0800
@@ -10,7 +10,6 @@
 	geanypy-highlighting.c \
 	geanypy-indentprefs.c \
 	geanypy-interfaceprefs.c \
-	geanypy-log.c \
 	geanypy-main.c \
 	geanypy-mainwidgets.c \
 	geanypy-msgwindow.c \
Only in geanypy/src: stamp-h1
Only in geanypy: win32env.mk

gpy-gpgpy.diff

Only in geany-plugins/geanypy: AUTHORS
Only in geanypy: autogen.sh
Only in geany-plugins/geanypy: ChangeLog
Only in geanypy: configure.ac
Only in geany-plugins/geanypy: doc
Only in geanypy: docs
diff -bur geanypy/geany/__init__.py geany-plugins/geanypy/geany/__init__.py
--- geanypy/geany/__init__.py	2017-02-16 19:53:00.106243600 -0800
+++ geany-plugins/geanypy/geany/__init__.py	2017-02-16 19:53:28.824760700 -0800
@@ -15,7 +15,6 @@
 import encoding
 import filetypes
 import highlighting
-import glog
 import main
 import msgwindow
 import navqueue
@@ -43,7 +42,6 @@
             "main_widgets",
             "interface_prefs",
             "app",
-            "glog",
             "keybindings",
             "general_prefs",
             "search_prefs",
Only in geanypy/geany: logger.py
diff -bur geanypy/geany/Makefile.am geany-plugins/geanypy/geany/Makefile.am
--- geanypy/geany/Makefile.am	2017-02-16 19:53:00.105824500 -0800
+++ geany-plugins/geanypy/geany/Makefile.am	2017-02-16 19:53:28.824426000 -0800
@@ -1,6 +1,5 @@
 geanypy_sources				=	__init__.py \
 								console.py \
-								logger.py \
 								plugin.py \
 								signalmanager.py
 geanypy_objects				=	$(geanypy_sources:.py=.pyc)
diff -bur geanypy/geany/plugin.py geany-plugins/geanypy/geany/plugin.py
--- geanypy/geany/plugin.py	2017-02-16 19:53:00.107888400 -0800
+++ geany-plugins/geanypy/geany/plugin.py	2017-02-16 19:53:28.825643500 -0800
@@ -35,8 +35,6 @@
 ~/.config/geany/plugins).  Only files with a `.py` extension will be loaded.
 """
 
-
-from geany.logger import PluginLogger
 import keybindings
 
 class Plugin(object):
@@ -62,7 +60,7 @@
 		When the plugin is loaded its __init__() function will be called
 		so that's a good place to put plugin initialization code.
 		"""
-		self.logger = PluginLogger(self.name)
+
 
 
 	def cleanup(self):
@@ -80,7 +78,7 @@
 		string name of the plugin.
 		"""
 		raise NotImplementedError(
-			"Plugin's must implement the __plugin_name__ attribute.")
+			"Plugins must implement the __plugin_name__ attribute.")
 
 
 	@property
Only in geanypy: geanypy.nsi
Only in geanypy: .git
Only in geanypy: .gitignore
diff -bur geanypy/Makefile.am geany-plugins/geanypy/Makefile.am
--- geanypy/Makefile.am	2017-02-16 19:53:00.097251600 -0800
+++ geany-plugins/geanypy/Makefile.am	2017-02-16 19:53:28.818652800 -0800
@@ -1,2 +1,4 @@
-ACLOCAL_AMFLAGS = -I m4
+include $(top_srcdir)/build/vars.auxfiles.mk
+#ACLOCAL_AMFLAGS += -I geanypy/m4
 SUBDIRS = src geany plugins
+plugin = geanypy
Only in geanypy: makefile.win32
Only in geany-plugins/geanypy: NEWS
Only in geany-plugins/geanypy: README
Only in geanypy: README.markdown
Only in geanypy: README.win32
diff -bur geanypy/src/geanypy-app.c geany-plugins/geanypy/src/geanypy-app.c
--- geanypy/src/geanypy-app.c	2017-02-16 19:53:00.112571800 -0800
+++ geany-plugins/geanypy/src/geanypy-app.c	2017-02-16 19:53:28.829331800 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-dialogs.c geany-plugins/geanypy/src/geanypy-dialogs.c
--- geanypy/src/geanypy-dialogs.c	2017-02-16 19:53:00.112879900 -0800
+++ geany-plugins/geanypy/src/geanypy-dialogs.c	2017-02-16 19:53:28.829656100 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-document.c geany-plugins/geanypy/src/geanypy-document.c
--- geanypy/src/geanypy-document.c	2017-02-16 19:53:00.113373500 -0800
+++ geany-plugins/geanypy/src/geanypy-document.c	2017-02-16 19:53:28.830123500 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
@@ -114,9 +118,9 @@
 	else if (g_str_equal(prop_name, "text_changed"))
 	{
 		if (self->doc->changed)
-			Py_RETURN_TRUE;
+			Py_RETURN_NONE;
 		else
-			Py_RETURN_FALSE;
+			Py_RETURN_NONE;
 	}
 
 	Py_RETURN_NONE;
@@ -183,14 +187,14 @@
 
 
 static PyObject*
-Document_reload_file(Document *self, PyObject *args, PyObject *kwargs)
+Document_reload_force(Document *self, PyObject *args, PyObject *kwargs)
 {
 	gchar *forced_enc = NULL;
 	static gchar *kwlist[] = { "forced_enc", NULL };
 
 	if (PyArg_ParseTupleAndKeywords(args, kwargs, "|z", kwlist, &forced_enc))
 	{
-		if (document_reload_file(self->doc, forced_enc))
+		if (document_reload_force(self->doc, forced_enc))
 			Py_RETURN_TRUE;
 		else
 			Py_RETURN_FALSE;
@@ -265,7 +269,11 @@
 static PyMethodDef Document_methods[] = {
 	{ "close",				(PyCFunction)Document_close, 		METH_NOARGS,
 		"Closes the document." },
-	{ "reload_file",		(PyCFunction)Document_reload_file,	METH_KEYWORDS,
+	/* Geany deprecated alias */
+	{ "reload_file",		(PyCFunction)Document_reload_force,	METH_KEYWORDS,
+		"Reloads the document with the specified file encoding or None "
+		"to auto-detect the file encoding." },
+	{ "reload_force",		(PyCFunction)Document_reload_force,	METH_KEYWORDS,
 		"Reloads the document with the specified file encoding or None "
 		"to auto-detect the file encoding." },
 	{ "rename_file",		(PyCFunction)Document_rename_file,	METH_KEYWORDS,
diff -bur geanypy/src/geanypy-editor.c geany-plugins/geanypy/src/geanypy-editor.c
--- geanypy/src/geanypy-editor.c	2017-02-16 19:53:00.114168800 -0800
+++ geany-plugins/geanypy/src/geanypy-editor.c	2017-02-16 19:53:28.830923900 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
@@ -58,7 +62,7 @@
 		PyObject *py_doc;
 		py_doc = (PyObject *) Document_create_new_from_geany_document(
 									self->editor->document);
-		if (!py_doc || py_doc == Py_None)
+		if (py_doc && py_doc != Py_None)
 			Py_RETURN_NONE;
 		return py_doc;
 	}
@@ -292,7 +296,7 @@
 	{ "indicator_set_on_range", (PyCFunction) Editor_indicator_set_on_range, METH_KEYWORDS,
 		"Sets an indicator on the range specified." },
 	{ "insert_snippet", (PyCFunction) Editor_insert_snippet, METH_KEYWORDS,
-		"Replaces all special sequences in snippet and inserts it at "
+		"Replces all special sequences in snippet and inserts it at "
 		"the specified position." },
 	{ "insert_text_block", (PyCFunction) Editor_insert_text_block, METH_KEYWORDS,
 		"Inserts text, replacing tab chars and newline chars accordingly "
diff -bur geanypy/src/geanypy-editor.h geany-plugins/geanypy/src/geanypy-editor.h
--- geanypy/src/geanypy-editor.h	2017-02-16 19:53:00.114448900 -0800
+++ geany-plugins/geanypy/src/geanypy-editor.h	2017-02-16 19:53:28.831221100 -0800
@@ -1,7 +1,7 @@
 #ifndef GEANYPY_EDITOR_H__
 #define GEANYPY_EDITOR_H__
 
-PyTypeObject IndentPrefsType;
+extern PyTypeObject IndentPrefsType;
 
 typedef struct
 {
diff -bur geanypy/src/geanypy-encoding.c geany-plugins/geanypy/src/geanypy-encoding.c
--- geanypy/src/geanypy-encoding.c	2017-02-16 19:53:00.114833300 -0800
+++ geany-plugins/geanypy/src/geanypy-encoding.c	2017-02-16 19:53:28.831634200 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-filetypes.c geany-plugins/geanypy/src/geanypy-filetypes.c
--- geanypy/src/geanypy-filetypes.c	2017-02-16 19:53:00.115527800 -0800
+++ geany-plugins/geanypy/src/geanypy-filetypes.c	2017-02-16 19:53:28.832380700 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
Only in geanypy/src: geanypy-glog.c
diff -bur geanypy/src/geanypy.h geany-plugins/geanypy/src/geanypy.h
--- geanypy/src/geanypy.h	2017-02-16 19:53:00.125131700 -0800
+++ geany-plugins/geanypy/src/geanypy.h	2017-02-16 19:53:28.841930800 -0800
@@ -75,6 +75,15 @@
 #include <string.h>
 
 #include <gtk/gtk.h>
+
+/* necessary for compilation with -fno-common,
+ * see https://bugzilla.gnome.org/show_bug.cgi?id=610657 for details,
+ * INCLUDE_PYGOBJECT_ONCE_FULL is set only once in geanypy-plugin.c */
+#ifndef INCLUDE_PYGOBJECT_ONCE_FULL
+#  define NO_IMPORT_PYGOBJECT
+#  define NO_IMPORT_PYGTK
+#endif
+
 #include <pygobject.h>
 
 #ifndef GEANYPY_WINDOWS
@@ -100,10 +109,6 @@
 #  define G_LOG_DOMAIN "GeanyPy"
 #endif
 
-#ifndef GEANYPY_WINDOWS
-#  include "plugin-config.h"
-#endif
-
 #include "geanypy-document.h"
 #include "geanypy-editor.h"
 #include "geanypy-encoding.h"
diff -bur geanypy/src/geanypy-highlighting.c geany-plugins/geanypy/src/geanypy-highlighting.c
--- geanypy/src/geanypy-highlighting.c	2017-02-16 19:53:00.116491700 -0800
+++ geany-plugins/geanypy/src/geanypy-highlighting.c	2017-02-16 19:53:28.833065900 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-indentprefs.c geany-plugins/geanypy/src/geanypy-indentprefs.c
--- geanypy/src/geanypy-indentprefs.c	2017-02-16 19:53:00.116798800 -0800
+++ geany-plugins/geanypy/src/geanypy-indentprefs.c	2017-02-16 19:53:28.833394200 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-interfaceprefs.c geany-plugins/geanypy/src/geanypy-interfaceprefs.c
--- geanypy/src/geanypy-interfaceprefs.c	2017-02-16 19:53:00.117169900 -0800
+++ geany-plugins/geanypy/src/geanypy-interfaceprefs.c	2017-02-16 19:53:28.833776800 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-main.c geany-plugins/geanypy/src/geanypy-main.c
--- geanypy/src/geanypy-main.c	2017-02-16 19:53:00.118142400 -0800
+++ geany-plugins/geanypy/src/geanypy-main.c	2017-02-16 19:53:28.834909900 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-mainwidgets.c geany-plugins/geanypy/src/geanypy-mainwidgets.c
--- geanypy/src/geanypy-mainwidgets.c	2017-02-16 19:53:00.118454400 -0800
+++ geany-plugins/geanypy/src/geanypy-mainwidgets.c	2017-02-16 19:53:28.835242600 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-msgwindow.c geany-plugins/geanypy/src/geanypy-msgwindow.c
--- geanypy/src/geanypy-msgwindow.c	2017-02-16 19:53:00.118762100 -0800
+++ geany-plugins/geanypy/src/geanypy-msgwindow.c	2017-02-16 19:53:28.835600000 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-navqueue.c geany-plugins/geanypy/src/geanypy-navqueue.c
--- geanypy/src/geanypy-navqueue.c	2017-02-16 19:53:00.119069900 -0800
+++ geany-plugins/geanypy/src/geanypy-navqueue.c	2017-02-16 19:53:28.835922100 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-plugin.c geany-plugins/geanypy/src/geanypy-plugin.c
--- geanypy/src/geanypy-plugin.c	2017-02-16 19:53:00.119552400 -0800
+++ geany-plugins/geanypy/src/geanypy-plugin.c	2017-02-16 19:53:28.836380900 -0800
@@ -19,6 +19,12 @@
  * MA 02110-1301, USA.
  */
 
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
+#define INCLUDE_PYGOBJECT_ONCE_FULL
+
 #include "geanypy.h"
 #include "geanypy-keybindings.h"
 
@@ -34,7 +40,6 @@
 PyMODINIT_FUNC initeditor(void);
 PyMODINIT_FUNC initencoding(void);
 PyMODINIT_FUNC initfiletypes(void);
-PyMODINIT_FUNC initglog(void);
 PyMODINIT_FUNC inithighlighting(void);
 PyMODINIT_FUNC initmain(void);
 PyMODINIT_FUNC initmsgwin(void);
@@ -76,7 +81,6 @@
     initeditor();
     initencoding();
     initfiletypes();
-    initglog();
     inithighlighting();
     initmain();
     initmsgwin();
@@ -413,5 +417,5 @@
 	plugin->funcs->init       = geanypy_init;
 	plugin->funcs->cleanup    = geanypy_cleanup;
 
-	GEANY_PLUGIN_REGISTER_FULL(plugin, 224, state, g_free);
+	GEANY_PLUGIN_REGISTER_FULL(plugin, 226, state, g_free);
 }
diff -bur geanypy/src/geanypy-prefs.c geany-plugins/geanypy/src/geanypy-prefs.c
--- geanypy/src/geanypy-prefs.c	2017-02-16 19:53:00.120223700 -0800
+++ geany-plugins/geanypy/src/geanypy-prefs.c	2017-02-16 19:53:28.837101300 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-project.c geany-plugins/geanypy/src/geanypy-project.c
--- geanypy/src/geanypy-project.c	2017-02-16 19:53:00.120542300 -0800
+++ geany-plugins/geanypy/src/geanypy-project.c	2017-02-16 19:53:28.837431000 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-project.h geany-plugins/geanypy/src/geanypy-project.h
--- geanypy/src/geanypy-project.h	2017-02-16 19:53:00.120811300 -0800
+++ geany-plugins/geanypy/src/geanypy-project.h	2017-02-16 19:53:28.837718500 -0800
@@ -1,7 +1,7 @@
 #ifndef GEANYPY_PROJECT_H__
 #define GEANYPY_PROJECT_H__
 
-PyTypeObject ProjectType;
+extern PyTypeObject ProjectType;
 
 typedef struct
 {
diff -bur geanypy/src/geanypy-scinotification.c geany-plugins/geanypy/src/geanypy-scinotification.c
--- geanypy/src/geanypy-scinotification.c	2017-02-16 19:53:00.121169100 -0800
+++ geany-plugins/geanypy/src/geanypy-scinotification.c	2017-02-16 19:53:28.838078800 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-scinotifyheader.c geany-plugins/geanypy/src/geanypy-scinotifyheader.c
--- geanypy/src/geanypy-scinotifyheader.c	2017-02-16 19:53:00.121506600 -0800
+++ geany-plugins/geanypy/src/geanypy-scinotifyheader.c	2017-02-16 19:53:28.838404100 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-scintilla.c geany-plugins/geanypy/src/geanypy-scintilla.c
--- geanypy/src/geanypy-scintilla.c	2017-02-16 19:53:00.122183400 -0800
+++ geany-plugins/geanypy/src/geanypy-scintilla.c	2017-02-16 19:53:28.839067500 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-scintilla.h geany-plugins/geanypy/src/geanypy-scintilla.h
--- geanypy/src/geanypy-scintilla.h	2017-02-16 19:53:00.122507000 -0800
+++ geany-plugins/geanypy/src/geanypy-scintilla.h	2017-02-16 19:53:28.839380400 -0800
@@ -1,8 +1,8 @@
 #ifndef GEANYPY_SCINTILLA_H__
 #define GEANYPY_SCINTILLA_H__
 
-PyTypeObject NotificationType;
-PyTypeObject NotifyHeaderType;
+extern PyTypeObject NotificationType;
+extern PyTypeObject NotifyHeaderType;
 
 typedef struct
 {
diff -bur geanypy/src/geanypy-search.c geany-plugins/geanypy/src/geanypy-search.c
--- geanypy/src/geanypy-search.c	2017-02-16 19:53:00.122834500 -0800
+++ geany-plugins/geanypy/src/geanypy-search.c	2017-02-16 19:53:28.839733900 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
diff -bur geanypy/src/geanypy-signalmanager.c geany-plugins/geanypy/src/geanypy-signalmanager.c
--- geanypy/src/geanypy-signalmanager.c	2017-02-16 19:53:00.123256400 -0800
+++ geany-plugins/geanypy/src/geanypy-signalmanager.c	2017-02-16 19:53:28.840157300 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 struct _SignalManager
@@ -47,6 +51,7 @@
 		if (PyErr_Occurred())
 			PyErr_Print();
 		g_warning("Unable to import 'geany' module");
+		g_free(man);
 		return NULL;
 	}
 
@@ -57,6 +62,7 @@
 		if (PyErr_Occurred())
 			PyErr_Print();
 		g_warning("Unable to get 'SignalManager' instance from 'geany' module.");
+		g_free(man);
 		return NULL;
 	}
 	man->obj = pygobject_get(man->py_obj);
diff -bur geanypy/src/geanypy-templates.c geany-plugins/geanypy/src/geanypy-templates.c
--- geanypy/src/geanypy-templates.c	2017-02-16 19:53:00.123928400 -0800
+++ geany-plugins/geanypy/src/geanypy-templates.c	2017-02-16 19:53:28.840799800 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 /* TODO: see if the TemplatePrefs members are safe to modify. */
diff -bur geanypy/src/geanypy-uiutils.c geany-plugins/geanypy/src/geanypy-uiutils.c
--- geanypy/src/geanypy-uiutils.c	2017-02-16 19:53:00.124489900 -0800
+++ geany-plugins/geanypy/src/geanypy-uiutils.c	2017-02-16 19:53:28.841284300 -0800
@@ -1,3 +1,7 @@
+#if defined(HAVE_CONFIG_H) && !defined(GEANYPY_WINDOWS)
+# include "config.h"
+#endif
+
 #include "geanypy.h"
 
 
@@ -123,8 +127,8 @@
 	{
 		GOB_CHECK(py_cbo, 1);
 		widget = pygobject_get(py_cbo);
-		GOB_TYPE_CHECK(widget, GTK_TYPE_COMBO_BOX_ENTRY, 1);
-		ui_combo_box_add_to_history(GTK_COMBO_BOX_ENTRY(widget), text, hist_len);
+		GOB_TYPE_CHECK(widget, GTK_TYPE_COMBO_BOX_TEXT, 1);
+		ui_combo_box_add_to_history(GTK_COMBO_BOX_TEXT(widget), text, hist_len);
 	}
 
 	Py_RETURN_NONE;
@@ -355,7 +359,7 @@
 		GOB_CHECK(py_widget, 1);
 		widget = pygobject_get(py_widget);
 		GOB_TYPE_CHECK(widget, GTK_TYPE_WIDGET, 1);
-		ui_widget_set_tooltip_text(GTK_WIDGET(widget), text);
+		gtk_widget_set_tooltip_text(GTK_WIDGET(widget), text);
 	}
 
 	Py_RETURN_NONE;
diff -bur geanypy/src/geanypy-uiutils.h geany-plugins/geanypy/src/geanypy-uiutils.h
--- geanypy/src/geanypy-uiutils.h	2017-02-16 19:53:00.124787200 -0800
+++ geany-plugins/geanypy/src/geanypy-uiutils.h	2017-02-16 19:53:28.841586200 -0800
@@ -1,8 +1,8 @@
 #ifndef GEANYPY_UI_UTILS_H__
 #define GEANYPY_UI_UTILS_H__
 
-PyTypeObject InterfacePrefsType;
-PyTypeObject MainWidgetsType;
+extern PyTypeObject InterfacePrefsType;
+extern PyTypeObject MainWidgetsType;
 
 typedef struct
 {
diff -bur geanypy/src/Makefile.am geany-plugins/geanypy/src/Makefile.am
--- geanypy/src/Makefile.am	2017-02-16 19:53:00.112224600 -0800
+++ geany-plugins/geanypy/src/Makefile.am	2017-02-16 19:53:28.828959800 -0800
@@ -1,3 +1,6 @@
+include $(top_srcdir)/build/vars.build.mk
+plugin = geanypy
+
 geanyplugin_LTLIBRARIES		=	geanypy.la
 geanyplugindir				=	$(libdir)/geany
 
@@ -5,23 +8,23 @@
 geanypy_la_CPPFLAGS			=	@GEANY_CFLAGS@ @PYGTK_CFLAGS@ @PYTHON_CPPFLAGS@ \
 								-DGEANYPY_PYTHON_DIR="\"$(libdir)/geany/geanypy\"" \
 								-DGEANYPY_PLUGIN_DIR="\"$(libdir)/geany\"" \
-								-DG_LOG_DOMAIN=\"GeanyPy\" \
-								-UHAVE_CONFIG_H
+								-DG_LOG_DOMAIN=\"GeanyPy\"
+geanypy_la_CFLAGS			=	@GEANYPY_CFLAGS@ @GMODULE_CFLAGS@
 geanypy_la_LIBADD			=	@GEANY_LIBS@ @PYGTK_LIBS@ \
 								$(PYTHON_LDFLAGS) $(PYTHON_LIBS) \
-								@PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@
+								@PYTHON_EXTRA_LIBS@ @PYTHON_EXTRA_LDFLAGS@ \
+								@GMODULE_LIBS@
 geanypy_la_SOURCES			=	geanypy-app.c \
 								geanypy-dialogs.c \
 								geanypy-document.c geanypy-document.h \
 								geanypy-editor.c geanypy-editor.h \
 								geanypy-encoding.c geanypy-encoding.h \
 								geanypy-filetypes.c geanypy-filetypes.h \
-								geanypy-glog.c \
 								geanypy.h \
 								geanypy-highlighting.c \
 								geanypy-indentprefs.c \
 								geanypy-interfaceprefs.c \
-								geanypy-keybindings.c \
+								geanypy-keybindings.c geanypy-keybindings.h\
 								geanypy-main.c \
 								geanypy-mainwidgets.c \
 								geanypy-msgwindow.c \
@@ -36,3 +39,5 @@
 								geanypy-signalmanager.c geanypy-signalmanager.h \
 								geanypy-templates.c \
 								geanypy-uiutils.c geanypy-uiutils.h
+
+include $(top_srcdir)/build/cppcheck.mk
diff -bur geanypy/src/makefile.win32 geany-plugins/geanypy/src/makefile.win32
--- geanypy/src/makefile.win32	2017-02-16 19:53:00.125670300 -0800
+++ geany-plugins/geanypy/src/makefile.win32	2017-02-16 19:53:28.842240400 -0800
@@ -10,7 +10,6 @@
 	geanypy-highlighting.c \
 	geanypy-indentprefs.c \
 	geanypy-interfaceprefs.c \
-	geanypy-log.c \
 	geanypy-main.c \
 	geanypy-mainwidgets.c \
 	geanypy-msgwindow.c \
Only in geanypy: win32env.mk