Merge branch 'master' of github.com:mate-desktop/pluma

pluma/Makefile.am

@@ -226,9 +226,6 @@ install-exec-hook:
 if PLATFORM_WIN32
 	$(mkinstalldirs) "$(DESTDIR)$(libdir)"
 	$(INSTALL_DATA) libpluma.a "$(DESTDIR)$(libdir)"
-else
-	rm -f $(DESTDIR)$(bindir)/mate-text-editor
-	ln -s pluma $(DESTDIR)$(bindir)/mate-text-editor
 endif
 
 if !OS_WIN32

pluma/pluma-style-scheme-manager.c

@@ -38,6 +38,11 @@
 #include <glib/gi18n.h>
 #include <glib/gstdio.h>
 
+#include <gtk/gtk.h>
+#if GTK_CHECK_VERSION (3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#endif
+
 #include "pluma-style-scheme-manager.h"
 #include "pluma-prefs-manager.h"
 #include "pluma-dirs.h"