diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-26 16:03:49 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@googlemail.com> | 2013-03-26 16:03:49 +0000 |
| commit | d2bba282171a9e2c70a624794650689ec4531047 (patch) | |
| tree | 726ae8aa2ae75cc8272f13fa09ed8abc56e60724 /src/extension | |
| parent | Revert r12183 and replace with better work-around for Pango bug (incorrect (diff) | |
| download | inkscape-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/extension')
| -rw-r--r-- | src/extension/init.cpp | 4 | ||||
| -rw-r--r-- | src/extension/internal/odf.h | 5 | ||||
| -rw-r--r-- | src/extension/script/InkscapeScript.h | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/src/extension/init.cpp b/src/extension/init.cpp index 5555eddf6..d403d270f 100644 --- a/src/extension/init.cpp +++ b/src/extension/init.cpp @@ -26,8 +26,10 @@ #include "path-prefix.h" #include "inkscape.h" -#include <glibmm/ustring.h> + +#include <glibmm/fileutils.h> #include <glibmm/i18n.h> +#include <glibmm/ustring.h> #include "system.h" #include "db.h" diff --git a/src/extension/internal/odf.h b/src/extension/internal/odf.h index 219a99a4f..001f5e1f1 100644 --- a/src/extension/internal/odf.h +++ b/src/extension/internal/odf.h @@ -27,19 +27,18 @@ #include <io/stringstream.h> #include <dom/uri.h> -#include <glibmm.h> #include "extension/implementation/implementation.h" - #include <xml/repr.h> #include <string> #include <map> #include <dom/util/ziptool.h> -//#include <io/domstream.h> #include "sp-item.h" +#include <glibmm/ustring.h> + namespace Inkscape { namespace Extension diff --git a/src/extension/script/InkscapeScript.h b/src/extension/script/InkscapeScript.h index 2ebeb1b19..8d6346582 100644 --- a/src/extension/script/InkscapeScript.h +++ b/src/extension/script/InkscapeScript.h @@ -12,7 +12,9 @@ #include "config.h" -#include <glibmm.h> +namespace Glib { +class ustring; +} namespace Inkscape { |