Switch to top-level glib headers. Thanks to DimStar for patch

Fixed bugs:
  - https://launchpad.net/bugs/898538

(bzr r10762)

13 files changed, 11 insertions, 20 deletions

diff --git a/src/svg/css-ostringstream.cpp b/src/svg/css-ostringstream.cpp
index f6e6a7293..33985443e 100644
--- a/src/svg/css-ostringstream.cpp
+++ b/src/svg/css-ostringstream.cpp
@@ -1,8 +1,7 @@
 #include "svg/css-ostringstream.h"
 #include "svg/strip-trailing-zeros.h"
 #include "preferences.h"
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 Inkscape::CSSOStringStream::CSSOStringStream()
 {
diff --git a/src/svg/css-ostringstream.h b/src/svg/css-ostringstream.h
index 52019f0d5..8cedb0979 100644
--- a/src/svg/css-ostringstream.h
+++ b/src/svg/css-ostringstream.h
@@ -1,7 +1,7 @@
 #ifndef SVG_CSS_OSTRINGSTREAM_H_INKSCAPE
 #define SVG_CSS_OSTRINGSTREAM_H_INKSCAPE
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <sstream>
 
 namespace Inkscape {
diff --git a/src/svg/stringstream.h b/src/svg/stringstream.h
index 5c819fcc6..d143abee8 100644
--- a/src/svg/stringstream.h
+++ b/src/svg/stringstream.h
@@ -1,7 +1,7 @@
 #ifndef INKSCAPE_STRINGSTREAM_H
 #define INKSCAPE_STRINGSTREAM_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <sstream>
 #include <string>
 
diff --git a/src/svg/strip-trailing-zeros.cpp b/src/svg/strip-trailing-zeros.cpp
index b0a14a74d..47da93249 100644
--- a/src/svg/strip-trailing-zeros.cpp
+++ b/src/svg/strip-trailing-zeros.cpp
@@ -1,7 +1,7 @@
 
 #include <cstring>
 #include <string>
-#include <glib/gmessages.h>
+#include <glib.h>
 
 #include "svg/strip-trailing-zeros.h"
 
diff --git a/src/svg/svg-affine.cpp b/src/svg/svg-affine.cpp
index a986e5986..44567a2bd 100644
--- a/src/svg/svg-affine.cpp
+++ b/src/svg/svg-affine.cpp
@@ -19,7 +19,7 @@
 #include <string>
 #include <cstdlib>
 #include <cstdio>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 #include <2geom/transforms.h>
 #include <2geom/angle.h>
 #include "svg.h"
diff --git a/src/svg/svg-color.cpp b/src/svg/svg-color.cpp
index 9293564d5..a8dff0bf0 100644
--- a/src/svg/svg-color.cpp
+++ b/src/svg/svg-color.cpp
@@ -21,12 +21,7 @@
 #include <string>
 #include <cassert>
 #include <math.h>
-#include <glib/gmem.h>
 #include <glib.h> // g_assert
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
-#include <glib/ghash.h>
-#include <glib/gutils.h>
 #include <errno.h>
 
 #include "strneq.h"
diff --git a/src/svg/svg-color.h b/src/svg/svg-color.h
index a3868c149..d1c7bee03 100644
--- a/src/svg/svg-color.h
+++ b/src/svg/svg-color.h
@@ -1,7 +1,7 @@
 #ifndef SVG_SVG_COLOR_H_SEEN
 #define SVG_SVG_COLOR_H_SEEN
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 class SVGICCColor;
 
diff --git a/src/svg/svg-length.cpp b/src/svg/svg-length.cpp
index 6b00cc807..d2f4332d8 100644
--- a/src/svg/svg-length.cpp
+++ b/src/svg/svg-length.cpp
@@ -19,7 +19,7 @@
 #include <cstring>
 #include <string>
 #include <math.h>
-#include <glib/gstrfuncs.h>
+#include <glib.h>
 
 #include "svg.h"
 #include "stringstream.h"
diff --git a/src/svg/svg-length.h b/src/svg/svg-length.h
index 66f473cfd..6c8f1e1dd 100644
--- a/src/svg/svg-length.h
+++ b/src/svg/svg-length.h
@@ -16,7 +16,7 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 class SVGLength
 {
diff --git a/src/svg/svg-path-geom-test.h b/src/svg/svg-path-geom-test.h
index 5735b6017..3558b4e55 100644
--- a/src/svg/svg-path-geom-test.h
+++ b/src/svg/svg-path-geom-test.h
@@ -8,7 +8,7 @@
 #include <stdio.h>
 #include <string>
 #include <vector>
-#include <glib/gmem.h>
+#include <glib.h>
 
 class SvgPathGeomTest : public CxxTest::TestSuite
 {
diff --git a/src/svg/svg-path.cpp b/src/svg/svg-path.cpp
index f4278a5ac..3f3b944ff 100644
--- a/src/svg/svg-path.cpp
+++ b/src/svg/svg-path.cpp
@@ -31,9 +31,6 @@
 #include <cstring>
 #include <string>
 #include <cassert>
-#include <glib/gmem.h>
-#include <glib/gmessages.h>
-#include <glib/gstrfuncs.h>
 #include <glib.h> // g_assert()
 
 #include "svg/svg.h"
diff --git a/src/svg/svg.h b/src/svg/svg.h
index de1d7d872..a7795b82e 100644
--- a/src/svg/svg.h
+++ b/src/svg/svg.h
@@ -11,7 +11,7 @@
  *
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
-#include <glib/gtypes.h>
+#include <glib.h>
 #include <vector>
 #include <cstring>
 #include <string>
diff --git a/src/svg/test-stubs.h b/src/svg/test-stubs.h
index 4e0731520..32acc0ef5 100644
--- a/src/svg/test-stubs.h
+++ b/src/svg/test-stubs.h
@@ -12,7 +12,7 @@
 #ifndef SEEN_TEST_STUBS_H
 #define SEEN_TEST_STUBS_H
 
-#include <glib/gtypes.h>
+#include <glib.h>
 
 long long int prefs_get_int_attribute(gchar const *path, gchar const *attr, long long int def);