From 221c035bca439c691d7e1b649d4b9d3382d43192 Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Mon, 2 Aug 2010 21:25:07 -0400 Subject: Define -DG_DISABLE_DEPRECATED, and remove deprecated glib symbol FDO#29365 --- droute/Makefile.am | 6 ++++-- droute/droute-test.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'droute') 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 -- cgit v1.2.1