summaryrefslogtreecommitdiffstats
path: root/src/libnrtype
diff options
context:
space:
mode:
authorAlex Valavanis <valavanisalex@gmail.com>2013-03-26 16:03:49 +0000
committerAlex Valavanis <valavanisalex@googlemail.com>2013-03-26 16:03:49 +0000
commitd2bba282171a9e2c70a624794650689ec4531047 (patch)
tree726ae8aa2ae75cc8272f13fa09ed8abc56e60724 /src/libnrtype
parentRevert r12183 and replace with better work-around for Pango bug (incorrect (diff)
downloadinkscape-d2bba282171a9e2c70a624794650689ec4531047.tar.gz
inkscape-d2bba282171a9e2c70a624794650689ec4531047.zip
Fix Glibmm inclusions for Gtk+ 3 builds and implement a Gtk+ 3 compatible check for X11 backend
Fixed bugs: - https://launchpad.net/bugs/1160252 - https://launchpad.net/bugs/1122774 (bzr r12247)
Diffstat (limited to 'src/libnrtype')
-rw-r--r--src/libnrtype/font-lister.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libnrtype/font-lister.cpp b/src/libnrtype/font-lister.cpp
index ace4a9ca9..39a04914b 100644
--- a/src/libnrtype/font-lister.cpp
+++ b/src/libnrtype/font-lister.cpp
@@ -9,7 +9,6 @@
#include <libnrtype/TextWrapper.h>
#include <libnrtype/one-glyph.h>
-#include <glibmm.h>
#include "font-lister.h"
#include "FontFactory.h"
@@ -22,6 +21,8 @@
#include "sp-root.h"
#include "xml/repr.h"
+#include <glibmm/regex.h>
+
//#define DEBUG_FONT
namespace Inkscape