[glibmm] Use GLIBMM_DISABLE_DEPRECATED on StreamIoChannel.

[Murray Cumming <murrayc src gnome org>]

commit d0680697e2138dc2395c400ccd2d8bfb2e0d0f88
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Jun 8 17:15:46 2010 +0200

    Use GLIBMM_DISABLE_DEPRECATED on StreamIoChannel.
    
    * glib/glibmm/streamiochannel.[h|cc]: Put #ifndef GLIBMM_DISABLE_DEPRECATED
        around this long-since-deprecated class.

 ChangeLog                      |    7 +++++++
 glib/glibmm/streamiochannel.cc |    5 ++++-
 glib/glibmm/streamiochannel.h  |    7 +++++--
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index d48f851..7e0e4d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-06-08  Murray Cumming  <murrayc murrayc com>
 
+	Use GLIBMM_DISABLE_DEPRECATED on StreamIoChannel.
+
+	* glib/glibmm/streamiochannel.[h|cc]: Put #ifndef GLIBMM_DISABLE_DEPRECATED
+    around this long-since-deprecated class.
+
+2010-06-08  Murray Cumming  <murrayc murrayc com>
+
 	Remove a junk line from VolumeMonitor.hg.
 
 	* gio/src/volumemonitor.hg: Remove this line because it must have been
diff --git a/glib/glibmm/streamiochannel.cc b/glib/glibmm/streamiochannel.cc
index 53228b0..08b661b 100644
--- a/glib/glibmm/streamiochannel.cc
+++ b/glib/glibmm/streamiochannel.cc
@@ -25,6 +25,8 @@
 namespace Glib
 {
 
+#ifndef GLIBMM_DISABLE_DEPRECATED
+
 // static
 Glib::RefPtr<StreamIOChannel> StreamIOChannel::create(std::istream& stream)
 {
@@ -189,5 +191,6 @@ Glib::RefPtr<Glib::Source> StreamIOChannel::create_watch_vfunc(IOCondition)
   return Glib::RefPtr<Glib::Source>();
 }
 
-} // namespace Glib
+#endif //GLIBMM_DISABLE_DEPRECATED
 
+} // namespace Glib
diff --git a/glib/glibmm/streamiochannel.h b/glib/glibmm/streamiochannel.h
index 702a097..16b357f 100644
--- a/glib/glibmm/streamiochannel.h
+++ b/glib/glibmm/streamiochannel.h
@@ -27,8 +27,9 @@
 namespace Glib
 {
 
-/** This whole class is deprecated in glibmm&nbsp;2.2.
- * See the Glib::IOChannel documentation for an explanation.
+#ifndef GLIBMM_DISABLE_DEPRECATED
+
+/** @deprecated This whole class was deprecated in glibmm 2.2 - See the Glib::IOChannel documentation for an explanation.
  */
 class StreamIOChannel : public Glib::IOChannel
 {
@@ -54,6 +55,8 @@ protected:
   virtual Glib::RefPtr<Glib::Source> create_watch_vfunc(IOCondition cond);
 };
 
+#endif //#GLIBMM_DISABLE_DEPRECATED
+
 } // namespace Glib
 
 #endif /* _GLIBMM_STREAMIOCHANNEL_H */