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

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
=== modified file 'src/gloobus-preview-interface-text.h'
--- src/gloobus-preview-interface-text.h 2010-08-25 10:38:04 +0000
+++ src/gloobus-preview-interface-text.h 2014-12-20 21:13:24 +0000
@@ -1,8 +1,7 @@
1#ifndef _ITEXT_1#ifndef _ITEXT_
2#define _ITEXT_2#define _ITEXT_
33
4#include <gtksourceview/gtksourceview.h>4#include <gtksourceview/gtksource.h>
5#include <gtksourceview/gtksourcelanguagemanager.h>
6//sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview5//sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview
76
8#include "gloobus-preview-interface-main.h"7#include "gloobus-preview-interface-main.h"
98
=== modified file 'src/gloobus-preview-plugin-manager.cpp'
--- src/gloobus-preview-plugin-manager.cpp 2011-10-31 12:50:44 +0000
+++ src/gloobus-preview-plugin-manager.cpp 2014-12-20 21:13:24 +0000
@@ -1,6 +1,6 @@
1#include "gloobus-preview-plugin-manager.h"1#include "gloobus-preview-plugin-manager.h"
2#include <dlfcn.h>2#include <dlfcn.h>
3#include <gtksourceview/gtksourcelanguagemanager.h>3#include <gtksourceview/gtksource.h>
44
5vector<gp_plugin_container*> PluginManager::plugins;5vector<gp_plugin_container*> PluginManager::plugins;
6map<string, int> PluginManager::filetypes;6map<string, int> PluginManager::filetypes;
77
=== modified file 'src/plugin-text/plugin-text.h'
--- src/plugin-text/plugin-text.h 2010-03-27 15:55:08 +0000
+++ src/plugin-text/plugin-text.h 2014-12-20 21:13:24 +0000
@@ -3,10 +3,7 @@
33
4#ifndef PLUGIN_LOADER4#ifndef PLUGIN_LOADER
55
6#include <gtksourceview/gtksourceview.h>6#include <gtksourceview/gtksource.h>
7#include <gtksourceview/gtksourcelanguagemanager.h>
8#include <gtksourceview/gtksourcestylescheme.h>
9#include <gtksourceview/gtksourcestyleschememanager.h>
10#include <gio/gio.h>7#include <gio/gio.h>
118
12#include "../gloobus-preview-config.h"9#include "../gloobus-preview-config.h"

Subscribers

People subscribed via source and target branches