mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
119 lines
4.4 KiB
Diff
119 lines
4.4 KiB
Diff
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>
|