From 2d1275f0337e3fe49ea493f58135c81d0e3af36d Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 26 Aug 2014 11:55:28 +0100
Subject: Standardise InkscapeApplication GObject implementation (namespace not
 supported properly)

(bzr r13341.1.179)
---
 src/document-undo.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/document-undo.cpp')

diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index 53e701648..478266b7b 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -112,7 +112,7 @@ void Inkscape::DocumentUndo::done(SPDocument *doc, const unsigned int event_type
     maybeDone(doc, NULL, event_type, event_description);
 }
 
-void Inkscape::DocumentUndo::resetKey( Inkscape::Application * /*inkscape*/, SPDesktop * /*desktop*/, GObject *base )
+void Inkscape::DocumentUndo::resetKey( InkscapeApplication * /*inkscape*/, SPDesktop * /*desktop*/, GObject *base )
 {
     SPDocument *doc = reinterpret_cast<SPDocument *>(base);
     doc->actionkey.clear();
-- 
cgit v1.2.3


From 1f2d8bc4ce99e970cead4ca96c1859c383a9c043 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebrony@gmail.com>
Date: Sun, 31 Aug 2014 14:17:26 -0400
Subject: Header cleanup: stop using Glib types where they aren't truly needed.
 Eases GThread deprecation errors.

(bzr r13341.1.190)
---
 src/document-undo.cpp | 13 -------------
 1 file changed, 13 deletions(-)

(limited to 'src/document-undo.cpp')

diff --git a/src/document-undo.cpp b/src/document-undo.cpp
index 478266b7b..0519b6874 100644
--- a/src/document-undo.cpp
+++ b/src/document-undo.cpp
@@ -44,19 +44,6 @@
  * (Lauris Kaplinski)
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-
-
-#if HAVE_STRING_H
-#endif
-
-
-#if HAVE_STDLIB_H
-#endif
-
 #include <string>
 #include <cstring>
 #include "xml/repr.h"
-- 
cgit v1.2.3