Don't disable more deprecation warnings than necessary

* gio/src/application.hg:
* gio/src/desktopappinfo.hg:
* gio/src/file.hg:
* gio/src/notification.hg:
* gio/src/settings.[ccg|hg]:
* gio/src/simpleactiongroup.hg:
* gio/src/tlsconnection.hg:
* gio/src/volumemonitor.hg:
* glib/src/date.hg: Don't #undef G_DISABLE_DEPRECATED or #define
GLIB_DISABLE_DEPRECATION_WARNINGS. This is unnecessary when deprecated code
is surrounded by G_GNUC_[BEGIN|END]_IGNORE_DEPRECATIONS. Bug #750379.

9 files changed, 2 insertions, 44 deletions

diff --git a/gio/src/application.hg b/gio/src/application.hg
index 24b0167c..98c5e570 100644
--- a/gio/src/application.hg
+++ b/gio/src/application.hg
@@ -17,11 +17,6 @@
 
 _CONFIGINCLUDE(giommconfig.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
 #include <giomm/actiongroup.h>
 #include <giomm/actionmap.h>
 #include <giomm/applicationcommandline.h>
diff --git a/gio/src/desktopappinfo.hg b/gio/src/desktopappinfo.hg
index 916830ef..9c084014 100644
--- a/gio/src/desktopappinfo.hg
+++ b/gio/src/desktopappinfo.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -25,11 +23,6 @@ _CONFIGINCLUDE(giommconfig.h)
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
 namespace Glib
 {
 
diff --git a/gio/src/file.hg b/gio/src/file.hg
index 3618b060..27b991c7 100644
--- a/gio/src/file.hg
+++ b/gio/src/file.hg
@@ -15,11 +15,6 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
 #include <glibmm/error.h>
 #include <glibmm/interface.h>
 #include <giomm/appinfo.h>
diff --git a/gio/src/notification.hg b/gio/src/notification.hg
index cd5ec921..806cd2e8 100644
--- a/gio/src/notification.hg
+++ b/gio/src/notification.hg
@@ -21,11 +21,6 @@
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
 namespace Gio
 {
 class Icon;
diff --git a/gio/src/settings.ccg b/gio/src/settings.ccg
index d800aa90..03e48075 100644
--- a/gio/src/settings.ccg
+++ b/gio/src/settings.ccg
@@ -64,10 +64,12 @@ void Settings::bind_writable(const Glib::ustring& key,
 }
 
 _DEPRECATE_IFDEF_START
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 std::vector<Glib::ustring> Settings::list_schemas()
 {
   return Glib::ArrayHandler<Glib::ustring>::array_to_vector(g_settings_list_schemas(), Glib::OWNERSHIP_NONE);
 }
+G_GNUC_END_IGNORE_DEPRECATIONS
 _DEPRECATE_IFDEF_END
 
 }
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index e87c0b3a..eb660dd2 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -25,11 +25,6 @@ _CONFIGINCLUDE(giommconfig.h)
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
 namespace Gio
 {
 
diff --git a/gio/src/simpleactiongroup.hg b/gio/src/simpleactiongroup.hg
index 138e4fe0..0c3fc8c6 100644
--- a/gio/src/simpleactiongroup.hg
+++ b/gio/src/simpleactiongroup.hg
@@ -23,11 +23,6 @@ _CONFIGINCLUDE(giommconfig.h)
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
 namespace Gio
 {
 
diff --git a/gio/src/tlsconnection.hg b/gio/src/tlsconnection.hg
index bc753d3a..7a4a044e 100644
--- a/gio/src/tlsconnection.hg
+++ b/gio/src/tlsconnection.hg
@@ -24,11 +24,6 @@ _CONFIGINCLUDE(giommconfig.h)
 _DEFS(giomm,gio)
 _PINCLUDE(giomm/private/iostream_p.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
 namespace Gio
 {
 
diff --git a/gio/src/volumemonitor.hg b/gio/src/volumemonitor.hg
index 5a5fcf92..df326460 100644
--- a/gio/src/volumemonitor.hg
+++ b/gio/src/volumemonitor.hg
@@ -1,5 +1,3 @@
-// -*- Mode: C++; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-
 /* Copyright (C) 2007 The gtkmm Development Team
  *
  * This library is free software; you can redistribute it and/or
@@ -19,11 +17,6 @@
 
 _CONFIGINCLUDE(giommconfig.h)
 
-#m4 _PUSH(SECTION_CC_PRE_INCLUDES)
-#undef G_DISABLE_DEPRECATED
-#define GLIB_DISABLE_DEPRECATION_WARNINGS 1
-#m4 _POP()
-
 #include <giomm/drive.h>
 #include <giomm/volume.h>
 #include <giomm/mount.h>