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/main.cpp | |
| 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/main.cpp')
| -rw-r--r-- | src/main.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index 20330edbb..58ab19616 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -47,7 +47,6 @@ #endif /* Not def: POPT_TABLEEND */ #include <libxml/tree.h> -#include <glib.h> #include <glib/gprintf.h> #include <glib-object.h> #include <gtk/gtk.h> @@ -103,6 +102,9 @@ #include "extension/init.h" #include <glibmm/i18n.h> +#include <glibmm/main.h> +#include <glibmm/miscutils.h> + #include <gtkmm/main.h> #ifndef HAVE_BIND_TEXTDOMAIN_CODESET |