summaryrefslogtreecommitdiffstats
path: root/src/file.cpp
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/file.cpp
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/file.cpp')
-rw-r--r--src/file.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/file.cpp b/src/file.cpp
index 5737f0a8a..453ddb546 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -68,8 +68,10 @@
#include "ui/dialog/font-substitution.h"
#include <gtk/gtk.h>
-#include <glib.h>
+
+#include <glibmm/convert.h>
#include <glibmm/i18n.h>
+#include <glibmm/miscutils.h>
using Inkscape::DocumentUndo;