gloobus-preview

Merge lp:~ballogy/gloobus-preview/fix-gtksource-include into lp:gloobus-preview

  1. fix-gtksource-include
  2. Merge into last_working_branch
Proposed by Balló György
Status: Merged
Merged at revision: 291
Proposed branch: lp:~ballogy/gloobus-preview/fix-gtksource-include
Merge into: lp:gloobus-preview
Diff against target: 41 lines (+3/-7)
3 files modified
src/gloobus-preview-interface-text.h (+1/-2)
src/gloobus-preview-plugin-manager.cpp (+1/-1)
src/plugin-text/plugin-text.h (+1/-4)
To merge this branch: bzr merge lp:~ballogy/gloobus-preview/fix-gtksource-include
Reviewer Review Type Date Requested Status
Gloobus Developers Pending
Review via email: mp+245279@code.launchpad.net

Description of the change

Fix includes for gtksourceview

Recent versions of gtksourceview does not allow to include individual header files. Just use gtksource.h instead.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/gloobus-preview-interface-text.h'
2--- src/gloobus-preview-interface-text.h 2010-08-25 10:38:04 +0000
3+++ src/gloobus-preview-interface-text.h 2014-12-20 21:13:24 +0000
4@@ -1,8 +1,7 @@
5 #ifndef _ITEXT_
6 #define _ITEXT_
7
8-#include <gtksourceview/gtksourceview.h>
9-#include <gtksourceview/gtksourcelanguagemanager.h>
10+#include <gtksourceview/gtksource.h>
11 //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview
12
13 #include "gloobus-preview-interface-main.h"
14
15=== modified file 'src/gloobus-preview-plugin-manager.cpp'
16--- src/gloobus-preview-plugin-manager.cpp 2011-10-31 12:50:44 +0000
17+++ src/gloobus-preview-plugin-manager.cpp 2014-12-20 21:13:24 +0000
18@@ -1,6 +1,6 @@
19 #include "gloobus-preview-plugin-manager.h"
20 #include <dlfcn.h>
21-#include <gtksourceview/gtksourcelanguagemanager.h>
22+#include <gtksourceview/gtksource.h>
23
24 vector<gp_plugin_container*> PluginManager::plugins;
25 map<string, int> PluginManager::filetypes;
26
27=== modified file 'src/plugin-text/plugin-text.h'
28--- src/plugin-text/plugin-text.h 2010-03-27 15:55:08 +0000
29+++ src/plugin-text/plugin-text.h 2014-12-20 21:13:24 +0000
30@@ -3,10 +3,7 @@
31
32 #ifndef PLUGIN_LOADER
33
34-#include <gtksourceview/gtksourceview.h>
35-#include <gtksourceview/gtksourcelanguagemanager.h>
36-#include <gtksourceview/gtksourcestylescheme.h>
37-#include <gtksourceview/gtksourcestyleschememanager.h>
38+#include <gtksourceview/gtksource.h>
39 #include <gio/gio.h>
40
41 #include "../gloobus-preview-config.h"

Subscribers

People subscribed via source and target branches