[glibmm] Glib::Thread: Don't disable more deprecation warnings than necessary

[Kjell Ahlstedt <kjellahl src gnome org>]

commit c64c404259b74898bc14fd2c06fccef9fe2cfcbf
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date:   Wed Jun 17 18:28:35 2015 +0200

    Glib::Thread: Don't disable more deprecation warnings than necessary
    
    * glib/src/thread.hg: Don't define GLIB_DISABLE_DEPRECATION_WARNINGS in
    the .h file, only in the .cc file. If it's defined in the .h file,
    it disables warnings in every file that includes glibmm/thread.h or glibmm.h.
    Don't include <glibmmconfig.h> in the .cc file. It became unnecessary when
    thread.hg was added to glibmm_files_deprecated_hg in glib/src/filelist.am.
    Bug #750379.

 glib/src/thread.hg |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)
---
diff --git a/glib/src/thread.hg b/glib/src/thread.hg
index fb6f19b..dd116c3 100644
--- a/glib/src/thread.hg
+++ b/glib/src/thread.hg
@@ -21,23 +21,16 @@ _CONFIGINCLUDE(glibmmconfig.h)
 _IS_DEPRECATED // This whole file is deprecated.
 
 #m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-// Must be included in the .cc file before the generated #ifndef GLIBMM_DISABLE_DEPRECATED,
-// or else "configure --disable-deprecated-api" + "make" will fail.
-#include <glibmmconfig.h>
+//Stop the compiler warnings about using the deprecated API;
+#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
 #m4 _POP()
 
 // We use GThreadFunctions in the (deprecated) API, so we must temporarily undef G_DISABLE_DEPRECATED.
 // Temporarily undef G_DISABLE_DEPRECATED, redefining it later if appropriate.
 #if defined(G_DISABLE_DEPRECATED) && !defined(GLIBMM_G_DISABLE_DEPRECATED_UNDEFED)
-
 //Stop the deprecation ifdef guards around the API declarations:
 #undef G_DISABLE_DEPRECATED
-
-//Stop the compiler warnings about using the deprecated API;
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-
 #define GLIBMM_G_DISABLE_DEPRECATED_UNDEFED 1
-
 #endif
 
 #include <glib.h>
@@ -45,7 +38,6 @@ _IS_DEPRECATED // This whole file is deprecated.
 // Redefine G_DISABLE_DEPRECATED if it was defined before we temporarily undefed it:
 #if defined(GLIBMM_G_DISABLE_DEPRECATED_UNDEFED)
 #define G_DISABLE_DEPRECATED 1
-#undef GLIB_DISABLE_DEPRECATION_WARNINGS
 #undef GLIBMM_G_DISABLE_DEPRECATED_UNDEFED
 #endif