diff options
| author | Krzysztof Kosi??ski <tweenk.pl@gmail.com> | 2011-02-03 23:13:20 +0000 |
|---|---|---|
| committer | Krzysztof Kosiński <tweenk.pl@gmail.com> | 2011-02-03 23:13:20 +0000 |
| commit | 7c620545cbc054aaf59605e37b50bdd3c1cb1133 (patch) | |
| tree | 622fc936eacd8bb0e85f7106d5020e175da88be4 /src/extension | |
| parent | Translations. Context removed in filter-enums (context support too complex to... (diff) | |
| download | inkscape-7c620545cbc054aaf59605e37b50bdd3c1cb1133.tar.gz inkscape-7c620545cbc054aaf59605e37b50bdd3c1cb1133.zip | |
Fix Linux build after 2Geom update
(bzr r10031)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/dbus/dbus-init.cpp | 2 | ||||
| -rw-r--r-- | src/extension/dbus/document-interface.cpp | 45 | ||||
| -rw-r--r-- | src/extension/dbus/document-interface.h | 8 |
3 files changed, 25 insertions, 30 deletions
diff --git a/src/extension/dbus/dbus-init.cpp b/src/extension/dbus/dbus-init.cpp index 2ae606940..9c562d169 100644 --- a/src/extension/dbus/dbus-init.cpp +++ b/src/extension/dbus/dbus-init.cpp @@ -14,6 +14,8 @@ */ #include <dbus/dbus-glib.h> +// this is reguired so that giomm headers won't barf +#undef DBUS_MESSAGE_TYPE_INVALID #include "dbus-init.h" #include "application-interface.h" diff --git a/src/extension/dbus/document-interface.cpp b/src/extension/dbus/document-interface.cpp index 485e92aa6..0e5d8de50 100644 --- a/src/extension/dbus/document-interface.cpp +++ b/src/extension/dbus/document-interface.cpp @@ -18,41 +18,26 @@ #include "document-interface.h" #include <string.h> -#include "verbs.h" -#include "helper/action.h" //sp_action_perform - -#include "inkscape.h" //inkscape_find_desktop_by_dkey, activate desktops - #include "desktop-handles.h" //sp_desktop_document() -#include "xml/repr.h" //sp_repr_document_new - -#include "sp-object.h" - -#include "document.h" // getReprDoc() - #include "desktop-style.h" //sp_desktop_get_style - -#include "selection.h" //selection struct +#include "display/canvas-text.h" //text +#include "display/sp-canvas.h" //text +#include "document.h" // getReprDoc() +#include "extension/output.h" //IO +#include "extension/system.h" //IO +#include "file.h" //IO +#include "helper/action.h" //sp_action_perform +#include "inkscape.h" //inkscape_find_desktop_by_dkey, activate desktops +#include "layer-fns.h" //LPOS_BELOW +#include "live_effects/parameter/text.h" //text +#include "print.h" //IO #include "selection-chemistry.h"// lots of selection functions - +#include "selection.h" //selection struct #include "sp-ellipse.h" - -#include "layer-fns.h" //LPOS_BELOW - +#include "sp-object.h" #include "style.h" //style_write - -#include "file.h" //IO - -#include "extension/system.h" //IO - -#include "extension/output.h" //IO - -#include "print.h" //IO - -#include "live_effects/parameter/text.h" //text -#include "display/canvas-text.h" //text - -#include "display/sp-canvas.h" //text +#include "verbs.h" +#include "xml/repr.h" //sp_repr_document_new //#include "2geom/svg-path-parser.h" //get_node_coordinates diff --git a/src/extension/dbus/document-interface.h b/src/extension/dbus/document-interface.h index ac9fd11c1..12e033918 100644 --- a/src/extension/dbus/document-interface.h +++ b/src/extension/dbus/document-interface.h @@ -22,6 +22,14 @@ #include <dbus/dbus-glib.h> #include <dbus/dbus-glib-bindings.h> #include <dbus/dbus-glib-lowlevel.h> + +// this is reguired so that giomm headers won't barf +#undef DBUS_MESSAGE_TYPE_INVALID +#undef DBUS_MESSAGE_TYPE_METHOD_CALL +#undef DBUS_MESSAGE_TYPE_METHOD_RETURN +#undef DBUS_MESSAGE_TYPE_ERROR +#undef DBUS_MESSAGE_TYPE_SIGNAL + #include "desktop.h" #define DBUS_DOCUMENT_INTERFACE_PATH "/org/inkscape/document" |