Added configure/ifdef guards to only bring in the needed #include if glibmm has it.

(bzr r12353)

14 files changed, 30 insertions, 0 deletions

diff --git a/src/widgets/dash-selector.h b/src/widgets/dash-selector.h
index d3eab643a..4004d4089 100644
--- a/src/widgets/dash-selector.h
+++ b/src/widgets/dash-selector.h
@@ -10,7 +10,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/combobox.h>
diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h
index 8e828ca94..a93852803 100644
--- a/src/widgets/desktop-widget.h
+++ b/src/widgets/desktop-widget.h
@@ -12,7 +12,10 @@
  *      ? -2004
  */
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
+
 #include <gtkmm/window.h>
 #include "message.h"
 #include "ui/view/view-widget.h"
diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp
index 6882e263e..d9d62d3ec 100644
--- a/src/widgets/fill-style.cpp
+++ b/src/widgets/fill-style.cpp
@@ -22,7 +22,9 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/box.h>
 #include <glibmm/i18n.h>
diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h
index 2bca6a64f..a5a9dcfc2 100644
--- a/src/widgets/gradient-selector.h
+++ b/src/widgets/gradient-selector.h
@@ -15,7 +15,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <glib.h>
 #include <gtk/gtk.h>
diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h
index 9e3792c06..e90dc9af3 100644
--- a/src/widgets/gradient-vector.h
+++ b/src/widgets/gradient-vector.h
@@ -15,7 +15,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/liststore.h>
 
diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp
index c661ae41c..d613ca55d 100644
--- a/src/widgets/icon.cpp
+++ b/src/widgets/icon.cpp
@@ -16,7 +16,9 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/icontheme.h>
 #include <cstring>
diff --git a/src/widgets/icon.h b/src/widgets/icon.h
index 3c4d91748..123809a41 100644
--- a/src/widgets/icon.h
+++ b/src/widgets/icon.h
@@ -14,7 +14,10 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
+
 #include <gtkmm/widget.h>
 #include "icon-size.h"
 
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 9084188b1..40d2fb9f3 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -24,7 +24,9 @@
 #include <cstring>
 #include <string>
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include "widgets/swatch-selector.h"
 #include "../sp-pattern.h"
diff --git a/src/widgets/shrink-wrap-button.cpp b/src/widgets/shrink-wrap-button.cpp
index fed792adb..3558780ed 100644
--- a/src/widgets/shrink-wrap-button.cpp
+++ b/src/widgets/shrink-wrap-button.cpp
@@ -13,7 +13,9 @@
 #include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/button.h>
 #include <gtk/gtk.h>
diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h
index a48d2643d..4bd6c6959 100644
--- a/src/widgets/sp-attribute-widget.h
+++ b/src/widgets/sp-attribute-widget.h
@@ -19,7 +19,9 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/widget.h>
 #include <stddef.h>
diff --git a/src/widgets/spw-utilities.cpp b/src/widgets/spw-utilities.cpp
index c1a54c1ed..87ca80f2f 100644
--- a/src/widgets/spw-utilities.cpp
+++ b/src/widgets/spw-utilities.cpp
@@ -17,7 +17,9 @@
 #include <cstring>
 #include <string>
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/label.h>
diff --git a/src/widgets/stroke-marker-selector.h b/src/widgets/stroke-marker-selector.h
index d855fab06..6f5ee56c4 100644
--- a/src/widgets/stroke-marker-selector.h
+++ b/src/widgets/stroke-marker-selector.h
@@ -10,7 +10,9 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/combobox.h>
diff --git a/src/widgets/swatch-selector.h b/src/widgets/swatch-selector.h
index c2fd1255c..45015593c 100644
--- a/src/widgets/swatch-selector.h
+++ b/src/widgets/swatch-selector.h
@@ -1,7 +1,9 @@
 #ifndef SEEN_SP_SWATCH_SELECTOR_H
 #define SEEN_SP_SWATCH_SELECTOR_H
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/box.h>
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 92fe8a1ff..0fdf36d5f 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -29,7 +29,9 @@
 # include "config.h"
 #endif
 
+#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
 #include <glibmm/threads.h>
+#endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/action.h>