[gnome-settings-daemon] xsettings: Simplify test app

[Bastien Nocera <hadess src gnome org>]

commit 55413e5de9494f0ba5df657c1611e0a8f5d21820
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 26 17:21:20 2012 +0100

    xsettings: Simplify test app

 plugins/xsettings/Makefile.am      |    2 +-
 plugins/xsettings/test-xsettings.c |   28 ++++------------------------
 2 files changed, 5 insertions(+), 25 deletions(-)
---
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index e9ed929..9ada319 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -40,7 +40,7 @@ test_xsettings_SOURCES = \
 	test-xsettings.c
 
 test_xsettings_CFLAGS = $(test_gtk_modules_CFLAGS)
-test_xsettings_CPPFLAGS = $(test_gtk_modules_CPPFLAGS)
+test_xsettings_CPPFLAGS = $(test_gtk_modules_CPPFLAGS) -I$(top_srcdir)/plugins/common
 test_xsettings_LDADD = $(test_gtk_modules_LDADD)
 
 plugin_LTLIBRARIES = \
diff --git a/plugins/xsettings/test-xsettings.c b/plugins/xsettings/test-xsettings.c
index 691f028..b39c108 100644
--- a/plugins/xsettings/test-xsettings.c
+++ b/plugins/xsettings/test-xsettings.c
@@ -1,26 +1,6 @@
-#include "config.h"
-
+#define NEW gnome_xsettings_manager_new
+#define START gnome_xsettings_manager_start
+#define MANAGER GnomeXSettingsManager
 #include "gsd-xsettings-manager.h"
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-int
-main (void)
-{
-  GnomeXSettingsManager *manager;
-  GError *error = NULL;
-
-  bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-  textdomain (GETTEXT_PACKAGE);
-
-  gtk_init (NULL, NULL);
-
-  manager = gnome_xsettings_manager_new ();
-  gnome_xsettings_manager_start (manager, &error);
-  g_assert_no_error (error);
-
-  gtk_main ();
 
-  return 0;
-}
+#include "test-plugin.h"