[Xfce4-commits] [apps/mousepad] 01/01: For gtk3 include just gtksourceview/gtksource.h

noreply at xfce.org noreply at xfce.org
Tue Apr 23 04:14:51 CEST 2019


This is an automated email from the git hooks/post-receive script.

a   n   d   r   e       p   u   s   h   e   d       a       c   o   m   m   i   t       t   o       b   r   a   n   c   h       m   a   s   t   e   r   
   in repository apps/mousepad.

commit a8cffec7f2097c2c3dddfc83514df248d34b4e6c
Author: Andre Miranda <andreldm at xfce.org>
Date:   Mon Apr 22 23:13:59 2019 -0300

    For gtk3 include just gtksourceview/gtksource.h
---
 mousepad/mousepad-action-group.c        | 5 ++++-
 mousepad/mousepad-action-group.h        | 4 ++++
 mousepad/mousepad-dialogs.c             | 5 ++++-
 mousepad/mousepad-document.c            | 4 ++++
 mousepad/mousepad-encoding-dialog.c     | 5 +++++
 mousepad/mousepad-file.c                | 5 +++++
 mousepad/mousepad-file.h                | 4 ++++
 mousepad/mousepad-language-action.h     | 4 ++++
 mousepad/mousepad-prefs-dialog.c        | 4 ++++
 mousepad/mousepad-print.c               | 4 ++++
 mousepad/mousepad-statusbar.h           | 5 +++++
 mousepad/mousepad-style-scheme-action.c | 6 +++++-
 mousepad/mousepad-style-scheme-action.h | 5 +++++
 mousepad/mousepad-view.c                | 4 ++++
 mousepad/mousepad-window.c              | 5 +++++
 15 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/mousepad/mousepad-action-group.c b/mousepad/mousepad-action-group.c
index aa66d1b..dbdf1e2 100644
--- a/mousepad/mousepad-action-group.c
+++ b/mousepad/mousepad-action-group.c
@@ -21,9 +21,12 @@
 #include <mousepad/mousepad-style-scheme-action.h>
 #include <mousepad/mousepad-settings.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcelanguagemanager.h>
 #include <gtksourceview/gtksourcestyleschememanager.h>
-
+#endif
 
 
 enum
diff --git a/mousepad/mousepad-action-group.h b/mousepad/mousepad-action-group.h
index a2187ad..384de8b 100644
--- a/mousepad/mousepad-action-group.h
+++ b/mousepad/mousepad-action-group.h
@@ -18,8 +18,12 @@
 #define __MOUSEPAD_ACTION_GROUP_H__ 1
 
 #include <gtk/gtk.h>
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcelanguage.h>
 #include <gtksourceview/gtksourcestylescheme.h>
+#endif
 
 G_BEGIN_DECLS
 
diff --git a/mousepad/mousepad-dialogs.c b/mousepad/mousepad-dialogs.c
index 1a8ae00..76745b9 100644
--- a/mousepad/mousepad-dialogs.c
+++ b/mousepad/mousepad-dialogs.c
@@ -19,9 +19,12 @@
 #include <mousepad/mousepad-dialogs.h>
 #include <mousepad/mousepad-util.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcestylescheme.h>
 #include <gtksourceview/gtksourcestyleschememanager.h>
-
+#endif
 
 
 void
diff --git a/mousepad/mousepad-document.c b/mousepad/mousepad-document.c
index 870a14a..7a3c5fa 100644
--- a/mousepad/mousepad-document.c
+++ b/mousepad/mousepad-document.c
@@ -24,7 +24,11 @@
 #include <mousepad/mousepad-view.h>
 #include <mousepad/mousepad-window.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcebuffer.h>
+#endif
 
 #ifdef HAVE_MEMORY_H
 #include <memory.h>
diff --git a/mousepad/mousepad-encoding-dialog.c b/mousepad/mousepad-encoding-dialog.c
index 5c17f14..841fa39 100644
--- a/mousepad/mousepad-encoding-dialog.c
+++ b/mousepad/mousepad-encoding-dialog.c
@@ -22,7 +22,12 @@
 #include <mousepad/mousepad-util.h>
 
 #include <glib/gstdio.h>
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourceview.h>
+#endif
 
 
 
diff --git a/mousepad/mousepad-file.c b/mousepad/mousepad-file.c
index c3d494b..c70fdfb 100644
--- a/mousepad/mousepad-file.c
+++ b/mousepad/mousepad-file.c
@@ -19,9 +19,14 @@
 #include <mousepad/mousepad-file.h>
 
 #include <glib/gstdio.h>
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcebuffer.h>
 #include <gtksourceview/gtksourcelanguage.h>
 #include <gtksourceview/gtksourcelanguagemanager.h>
+#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
diff --git a/mousepad/mousepad-file.h b/mousepad/mousepad-file.h
index 134a772..d907a8d 100644
--- a/mousepad/mousepad-file.h
+++ b/mousepad/mousepad-file.h
@@ -21,7 +21,11 @@ G_BEGIN_DECLS
 
 #include <mousepad/mousepad-encoding.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcelanguage.h>
+#endif
 
 typedef struct _MousepadFileClass  MousepadFileClass;
 typedef struct _MousepadFile       MousepadFile;
diff --git a/mousepad/mousepad-language-action.h b/mousepad/mousepad-language-action.h
index de9ad4e..71e0111 100644
--- a/mousepad/mousepad-language-action.h
+++ b/mousepad/mousepad-language-action.h
@@ -18,7 +18,11 @@
 #define __MOUSEPAD_LANGUAGE_ACTION_H__ 1
 
 #include <gtk/gtk.h>
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcelanguage.h>
+#endif
 
 G_BEGIN_DECLS
 
diff --git a/mousepad/mousepad-prefs-dialog.c b/mousepad/mousepad-prefs-dialog.c
index 03e3f32..41b71e5 100644
--- a/mousepad/mousepad-prefs-dialog.c
+++ b/mousepad/mousepad-prefs-dialog.c
@@ -19,8 +19,12 @@
 #include <mousepad/mousepad-prefs-dialog-ui.h>
 #include <mousepad/mousepad-settings.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcestylescheme.h>
 #include <gtksourceview/gtksourcestyleschememanager.h>
+#endif
 
 
 
diff --git a/mousepad/mousepad-print.c b/mousepad/mousepad-print.c
index d835f97..63c470c 100644
--- a/mousepad/mousepad-print.c
+++ b/mousepad/mousepad-print.c
@@ -20,8 +20,12 @@
 #include <mousepad/mousepad-util.h>
 #include <mousepad/mousepad-print.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcebuffer.h>
 #include <gtksourceview/gtksourceprintcompositor.h>
+#endif
 
 #define DOCUMENT_SPACING (10)
 
diff --git a/mousepad/mousepad-statusbar.h b/mousepad/mousepad-statusbar.h
index a5f1724..4130d4c 100644
--- a/mousepad/mousepad-statusbar.h
+++ b/mousepad/mousepad-statusbar.h
@@ -18,7 +18,12 @@
 #define __MOUSEPAD_STATUSBAR_H__
 
 #include <gtk/gtk.h>
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcelanguage.h>
+#endif
 
 G_BEGIN_DECLS
 
diff --git a/mousepad/mousepad-style-scheme-action.c b/mousepad/mousepad-style-scheme-action.c
index 52b256a..26d0ca8 100644
--- a/mousepad/mousepad-style-scheme-action.c
+++ b/mousepad/mousepad-style-scheme-action.c
@@ -19,8 +19,12 @@
 #include <mousepad/mousepad-style-scheme-action.h>
 
 #include <glib/gi18n.h>
-#include <gtksourceview/gtksourcestyleschememanager.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
+#include <gtksourceview/gtksourcestyleschememanager.h>
+#endif
 
 
 enum
diff --git a/mousepad/mousepad-style-scheme-action.h b/mousepad/mousepad-style-scheme-action.h
index c71db9a..a6b1b15 100644
--- a/mousepad/mousepad-style-scheme-action.h
+++ b/mousepad/mousepad-style-scheme-action.h
@@ -18,7 +18,12 @@
 #define __MOUSEPAD_STYLESCHEME_ACTION_H__ 1
 
 #include <gtk/gtk.h>
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcestylescheme.h>
+#endif
 
 G_BEGIN_DECLS
 
diff --git a/mousepad/mousepad-view.c b/mousepad/mousepad-view.c
index 0ee0893..bbc569f 100644
--- a/mousepad/mousepad-view.c
+++ b/mousepad/mousepad-view.c
@@ -20,10 +20,14 @@
 #include <mousepad/mousepad-util.h>
 #include <mousepad/mousepad-view.h>
 
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcebuffer.h>
 #include <gtksourceview/gtksourceview.h>
 #include <gtksourceview/gtksourcestylescheme.h>
 #include <gtksourceview/gtksourcestyleschememanager.h>
+#endif
 
 #include <xfconf/xfconf.h>
 
diff --git a/mousepad/mousepad-window.c b/mousepad/mousepad-window.c
index 3c5ef04..ab84f4d 100644
--- a/mousepad/mousepad-window.c
+++ b/mousepad/mousepad-window.c
@@ -31,9 +31,14 @@
 #include <mousepad/mousepad-window-ui.h>
 
 #include <glib/gstdio.h>
+
+#if GTK_CHECK_VERSION(3, 0, 0)
+#include <gtksourceview/gtksource.h>
+#else
 #include <gtksourceview/gtksourcelanguage.h>
 #include <gtksourceview/gtksourcelanguagemanager.h>
 #include <gtksourceview/gtksourcebuffer.h>
+#endif
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Xfce4-commits mailing list