From 77fe5d8695e5be12ed1d543e18033b244861b086 Mon Sep 17 00:00:00 2001
From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 2 Dec 2016 22:18:16 -0800
Subject: [PATCH] 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.
---
 src/ui/gui/psppire-syntax-window.c | 5 +----
 src/ui/gui/psppire-syntax-window.h | 7 ++-----
 src/ui/gui/widgets.c               | 2 +-
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c
index 38a4a3f4ff..8750e995b2 100644
--- 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 ce4beac203..cb125028c9 100644
--- 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 b6948d9414..facae6b1dc 100644
--- 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"
 
-- 
2.30.2