[glibmm/gmmproc-refactor] Don't include deprecated thread.h.

[Krzesimir Nowak <krnowak src gnome org>]

commit d21026d3de7156ad33044f43000bc4653ad607dd
Author: Krzesimir Nowak <qdlacz gmail com>
Date:   Sun Jul 22 15:56:24 2012 +0200

    Don't include deprecated thread.h.
    
    We are not wrapping it anyway. But if we want to do it, then we will
    have to provide some kind of override or addition for some API wrapped
    there - some of it is not available in gir files.

 glib/glibmm.h       |    2 +-
 glib/glibmm/main.cc |   12 ------------
 2 files changed, 1 insertions(+), 13 deletions(-)
---
diff --git a/glib/glibmm.h b/glib/glibmm.h
index 9fb35e8..ef4af63 100644
--- a/glib/glibmm.h
+++ b/glib/glibmm.h
@@ -84,7 +84,7 @@
 
 //Include this first because we need it to be the first thing to include <glib.h>, 
 //so we can do an undef trick to still use deprecated API in the header: 
-#include <glibmm/thread.h>
+//#include <glibmm/thread.h>
 
 #include <glibmm/threads.h>
 
diff --git a/glib/glibmm/main.cc b/glib/glibmm/main.cc
index 47f2638..30e578c 100644
--- a/glib/glibmm/main.cc
+++ b/glib/glibmm/main.cc
@@ -22,11 +22,6 @@
 #define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 
 #include <glibmm/threads.h>
-
-#ifndef GLIBMM_DISABLE_DEPRECATED
-#include <glibmm/thread.h>
-#endif //GLIBMM_DISABLE_DEPRECATED
-
 #include <glibmm/main.h>
 #include <glibmm/exceptionhandler.h>
 #include <glibmm/wrap.h>
@@ -546,13 +541,6 @@ bool MainContext::acquire()
   return g_main_context_acquire(gobj());
 }
 
-#ifndef GLIBMM_DISABLE_DEPRECATED
-bool MainContext::wait(Glib::Cond& cond, Glib::Mutex& mutex)
-{
-  return g_main_context_wait(gobj(), cond.gobj(), mutex.gobj());
-}
-#endif //GLIBMM_DISABLE_DEPRECATED
-
 bool MainContext::wait(Glib::Threads::Cond& cond, Glib::Threads::Mutex& mutex)
 {
   return g_main_context_wait(gobj(), cond.gobj(), mutex.gobj());