summaryrefslogtreecommitdiffstats
path: root/src/file.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2013-03-28 23:11:49 +0000
committerJabiertxo Arraiza Zenotz <jtx@jtx.marker.es>2013-03-28 23:11:49 +0000
commitb0bc5900769742861a57b3200f25378a5d5138be (patch)
treec641716ac21b5f28e2a05284eedd4778605fbc69 /src/file.cpp
parentUpdate to trunk (diff)
parentFix for Bug #1161205 (Font substitution dialog appears when generic font fami... (diff)
downloadinkscape-b0bc5900769742861a57b3200f25378a5d5138be.tar.gz
inkscape-b0bc5900769742861a57b3200f25378a5d5138be.zip
Update to trunk
(bzr r11950.1.76)
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;