From 221c035bca439c691d7e1b649d4b9d3382d43192 Mon Sep 17 00:00:00 2001
From: Mike Gorse <mgorse@novell.com>
Date: Mon, 2 Aug 2010 21:25:07 -0400
Subject: [PATCH] Define -DG_DISABLE_DEPRECATED, and remove deprecated glib
 symbol

FDO#29365
---
 atk-adaptor/Makefile.include     | 3 ++-
 atk-adaptor/adaptors/Makefile.am | 3 ++-
 droute/Makefile.am               | 6 ++++--
 droute/droute-test.c             | 2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/atk-adaptor/Makefile.include b/atk-adaptor/Makefile.include
index d192f14..578e188 100644
--- a/atk-adaptor/Makefile.include
+++ b/atk-adaptor/Makefile.include
@@ -3,7 +3,8 @@ gtkmodule_LTLIBRARIES = libatk-bridge.la
 libatk_bridge_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
 		          $(ATK_CFLAGS)       \
 		          -I$(top_srcdir)     \
-		          -I$(top_srcdir)/atk-adaptor/adaptors
+		          -I$(top_srcdir)/atk-adaptor/adaptors \
+	-DG_DISABLE_DEPRECATED
 
 libatk_bridge_la_LDFLAGS = -no-undefined  \
 		           -module        \
diff --git a/atk-adaptor/adaptors/Makefile.am b/atk-adaptor/adaptors/Makefile.am
index 59a6ece..460d928 100644
--- a/atk-adaptor/adaptors/Makefile.am
+++ b/atk-adaptor/adaptors/Makefile.am
@@ -4,7 +4,8 @@ libatk_bridge_adaptors_la_CFLAGS =\
 			  $(DBUS_GLIB_CFLAGS) \
 		          $(ATK_CFLAGS)       \
 		          -I$(top_srcdir)     \
-		          -I$(top_srcdir)/atk-adaptor
+		          -I$(top_srcdir)/atk-adaptor \
+	-DG_DISABLE_DEPRECATED
 
 libatk_bridge_adaptors_la_LIBADD =\
 			  $(DBUS_GLIB_LIBS) \
diff --git a/droute/Makefile.am b/droute/Makefile.am
index 94cefaf..c8b34b8 100644
--- a/droute/Makefile.am
+++ b/droute/Makefile.am
@@ -2,7 +2,8 @@ noinst_LTLIBRARIES = libdroute.la
 
 libdroute_la_CFLAGS = $(DBUS_GLIB_CFLAGS) \
                       -I$(top_builddir)\
-                      -I$(top_srcdir)
+                      -I$(top_srcdir) \
+                      -DG_DISABLE_DEPRECATED
 
 libdroute_la_SOURCES =\
 		droute.c\
@@ -19,7 +20,8 @@ check_PROGRAMS = droute-test
 droute_test_SOURCES  = droute-test.c
 droute_test_CFLAGS = $(DBUS_GLIB_CFLAGS) \
 		     -I$(top_builddir)\
-		     -I$(top_srcdir)
+		     -I$(top_srcdir) \
+	-DG_DISABLE_DEPRECATED
 
 droute_test_LDFLAGS  = $(top_builddir)/dbind/libdbind.la\
 		       libdroute.la\
diff --git a/droute/droute-test.c b/droute/droute-test.c
index 32d8521..33766a2 100644
--- a/droute/droute-test.c
+++ b/droute/droute-test.c
@@ -267,7 +267,7 @@ int main (int argc, char **argv)
                                test_properties);
 
     g_idle_add (do_tests_func, NULL);
-    g_main_run(main_loop);
+    g_main_loop_run(main_loop);
     if (success)
             return 0;
     else
-- 
2.7.4