1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin@elementary.io>
Date: Wed, 4 Apr 2018 22:51:50 +0100
Subject: [PATCH] Use single header with GtkSource
---
libgda-ui/data-entries/plugins/gdaui-entry-text.c | 10 +---------
libgda-ui/data-entries/plugins/libmain.c | 10 +---------
tools/browser/data-manager/data-favorite-selector.c | 10 +---------
tools/browser/data-manager/xml-spec-editor.c | 10 +---------
tools/browser/query-exec/query-editor.c | 10 +---------
5 files changed, 5 insertions(+), 45 deletions(-)
diff --git a/libgda-ui/data-entries/plugins/gdaui-entry-text.c b/libgda-ui/data-entries/plugins/gdaui-entry-text.c
index e359820eb..b483128a4 100644
--- a/libgda-ui/data-entries/plugins/gdaui-entry-text.c
+++ b/libgda-ui/data-entries/plugins/gdaui-entry-text.c
@@ -25,15 +25,7 @@
#include <libgda/gda-blob-op.h>
#ifdef HAVE_GTKSOURCEVIEW
- #ifdef GTK_DISABLE_SINGLE_INCLUDES
- #undef GTK_DISABLE_SINGLE_INCLUDES
- #endif
-
- #include <gtksourceview/gtksourceview.h>
- #include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourcebuffer.h>
- #include <gtksourceview/gtksourcestyleschememanager.h>
- #include <gtksourceview/gtksourcestylescheme.h>
+ #include <gtksourceview/gtksource.h>
#endif
#define LANGUAGE_SQL "gda-sql"
diff --git a/libgda-ui/data-entries/plugins/libmain.c b/libgda-ui/data-entries/plugins/libmain.c
index a30c2db2c..c3a0f8f53 100644
--- a/libgda-ui/data-entries/plugins/libmain.c
+++ b/libgda-ui/data-entries/plugins/libmain.c
@@ -39,15 +39,7 @@
#endif
#ifdef HAVE_GTKSOURCEVIEW
- #ifdef GTK_DISABLE_SINGLE_INCLUDES
- #undef GTK_DISABLE_SINGLE_INCLUDES
- #endif
-
- #include <gtksourceview/gtksourceview.h>
- #include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourcebuffer.h>
- #include <gtksourceview/gtksourcestyleschememanager.h>
- #include <gtksourceview/gtksourcestylescheme.h>
+ #include <gtksourceview/gtksource.h>
#endif
static GdauiDataEntry *plugin_entry_filesel_create_func (GdaDataHandler *handler, GType type, const gchar *options);
diff --git a/tools/browser/data-manager/data-favorite-selector.c b/tools/browser/data-manager/data-favorite-selector.c
index d472fd5f6..815204d64 100644
--- a/tools/browser/data-manager/data-favorite-selector.c
+++ b/tools/browser/data-manager/data-favorite-selector.c
@@ -33,15 +33,7 @@
#include <libgda-ui/internal/popup-container.h>
#ifdef HAVE_GTKSOURCEVIEW
- #ifdef GTK_DISABLE_SINGLE_INCLUDES
- #undef GTK_DISABLE_SINGLE_INCLUDES
- #endif
-
- #include <gtksourceview/gtksourceview.h>
- #include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourcebuffer.h>
- #include <gtksourceview/gtksourcestyleschememanager.h>
- #include <gtksourceview/gtksourcestylescheme.h>
+ #include <gtksourceview/gtksource.h>
#endif
struct _DataFavoriteSelectorPrivate {
diff --git a/tools/browser/data-manager/xml-spec-editor.c b/tools/browser/data-manager/xml-spec-editor.c
index f4b893a00..b337d107c 100644
--- a/tools/browser/data-manager/xml-spec-editor.c
+++ b/tools/browser/data-manager/xml-spec-editor.c
@@ -28,15 +28,7 @@
#include <libgda/gda-debug-macros.h>
#ifdef HAVE_GTKSOURCEVIEW
-#ifdef GTK_DISABLE_SINGLE_INCLUDES
-#undef GTK_DISABLE_SINGLE_INCLUDES
-#endif
-
-#include <gtksourceview/gtksourceview.h>
-#include <gtksourceview/gtksourcelanguagemanager.h>
-#include <gtksourceview/gtksourcebuffer.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
-#include <gtksourceview/gtksourcestylescheme.h>
+#include <gtksourceview/gtksource.h>
#endif
struct _XmlSpecEditorPrivate {
diff --git a/tools/browser/query-exec/query-editor.c b/tools/browser/query-exec/query-editor.c
index 061aefb9d..7cb9923ac 100644
--- a/tools/browser/query-exec/query-editor.c
+++ b/tools/browser/query-exec/query-editor.c
@@ -22,15 +22,7 @@
#include <string.h>
#include <gdk/gdkkeysyms.h>
#ifdef HAVE_GTKSOURCEVIEW
- #ifdef GTK_DISABLE_SINGLE_INCLUDES
- #undef GTK_DISABLE_SINGLE_INCLUDES
- #endif
-
- #include <gtksourceview/gtksourceview.h>
- #include <gtksourceview/gtksourcelanguagemanager.h>
- #include <gtksourceview/gtksourcebuffer.h>
- #include <gtksourceview/gtksourcestyleschememanager.h>
- #include <gtksourceview/gtksourcestylescheme.h>
+ #include <gtksourceview/gtksource.h>
#endif
#include "query-editor.h"
#include <binreloc/gda-binreloc.h>
|