gui: Fix #includes for gtksourceview.

Newer versions of gtksourceview only allow gtksource.h to be included
directly, so this commit changes PSPPIRE to only include that header.

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 38a4a3f4ff94a3f8ddad8ac8be334de9d570c5fa..8750e995b22244145101aad24b9f35a9e48d57c8 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.c
+++ b/src/ui/gui/psppire-syntax-window.c
@@ -19,10 +19,7 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
-#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourcelanguage.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
+#include <gtksourceview/gtksource.h>
 
 #include "language/lexer/lexer.h"
 #include "libpspp/encoding-guesser.h"

diff --git a/src/ui/gui/psppire-syntax-window.h b/src/ui/gui/psppire-syntax-window.h
index ce4beac203488b04625af52088d9bbaef0242064..cb125028c94181b4c94ac229d60d42a90f82d4ad 100644 (file)
--- a/src/ui/gui/psppire-syntax-window.h
+++ b/src/ui/gui/psppire-syntax-window.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2010, 2011, 2016  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -23,10 +23,7 @@
 #include <gtk/gtk.h>
 #include "psppire-window.h"
 
-#include <gtksourceview/gtksourcelanguage.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourceprintcompositor.h>
+#include <gtksourceview/gtksource.h>
 
 G_BEGIN_DECLS
 

diff --git a/src/ui/gui/widgets.c b/src/ui/gui/widgets.c
index b6948d9414a46647ebf2a1cb394188e30a0b90d1..facae6b1dc5bbd408756a17a71432cadfeea458f 100644 (file)
--- a/src/ui/gui/widgets.c
+++ b/src/ui/gui/widgets.c
@@ -1,6 +1,6 @@
 #include <config.h>
 
-#include <gtksourceview/gtksourceview.h>
+#include <gtksourceview/gtksource.h>
 
 #include "widgets.h"