diff options
| author | Alex Valavanis <valavanisalex@gmail.com> | 2013-03-25 17:42:31 +0000 |
|---|---|---|
| committer | Alex Valavanis <valavanisalex@googlemail.com> | 2013-03-25 17:42:31 +0000 |
| commit | 0cdd007ebf8dcfbd39c1d36ab53f43617eb692df (patch) | |
| tree | 0ac5146d9316011fa285ff0733c30acddfcab965 /src/extension | |
| parent | Translations. Fix for Bug #837962 (Untranslatable and not localized strings). (diff) | |
| download | inkscape-0cdd007ebf8dcfbd39c1d36ab53f43617eb692df.tar.gz inkscape-0cdd007ebf8dcfbd39c1d36ab53f43617eb692df.zip | |
Workaround usage of deprecated glib symbols in 3rd party libraries
Fixed bugs:
- https://launchpad.net/bugs/1122774
(bzr r12243)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/error-file.cpp | 5 | ||||
| -rw-r--r-- | src/extension/extension.cpp | 2 | ||||
| -rw-r--r-- | src/extension/param/string.cpp | 3 | ||||
| -rw-r--r-- | src/extension/prefdialog.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index 778295f47..5a8bede70 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -12,12 +12,11 @@ #include "config.h" #endif -#include <glibmm/i18n.h> - +#include "ui/dialog/extensions.h" +#include <glibmm/i18n.h> #include "inkscape.h" #include "preferences.h" -#include "ui/dialog/extensions.h" #include "extension/extension.h" #include "error-file.h" diff --git a/src/extension/extension.cpp b/src/extension/extension.cpp index 28f556e75..f9cf70960 100644 --- a/src/extension/extension.cpp +++ b/src/extension/extension.cpp @@ -19,7 +19,6 @@ # include "config.h" #endif -#include <glibmm/i18n.h> #include <gtkmm/box.h> #include <gtkmm/label.h> #include <gtkmm/frame.h> @@ -30,6 +29,7 @@ # include <gtkmm/table.h> #endif +#include <glibmm/i18n.h> #include "inkscape.h" #include "extension/implementation/implementation.h" #include "extension.h" diff --git a/src/extension/param/string.cpp b/src/extension/param/string.cpp index 2020fb24d..4e525ff73 100644 --- a/src/extension/param/string.cpp +++ b/src/extension/param/string.cpp @@ -10,11 +10,12 @@ # include "config.h" #endif -#include <glibmm/value.h> #include <gtkmm/adjustment.h> #include <gtkmm/box.h> #include <gtkmm/spinbutton.h> +#include <glibmm/value.h> + #include "xml/node.h" #include "extension/extension.h" #include "string.h" diff --git a/src/extension/prefdialog.h b/src/extension/prefdialog.h index 943273623..e1999791f 100644 --- a/src/extension/prefdialog.h +++ b/src/extension/prefdialog.h @@ -10,8 +10,8 @@ #ifndef INKSCAPE_EXTENSION_DIALOG_H__ #define INKSCAPE_EXTENSION_DIALOG_H__ -#include <glibmm/value.h> #include <gtkmm/dialog.h> +#include <glibmm/value.h> #include <glibmm/ustring.h> |