plugins: Rename sources of all test applications

https://bugzilla.gnome.org/show_bug.cgi?id=772370

44 files changed, 46 insertions, 46 deletions

diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index 840cc7d6..ed30107a 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -7,7 +7,7 @@ libexec_PROGRAMS = gsd-a11y-keyboard
 gsd_a11y_keyboard_SOURCES =			\
 	gsd-a11y-keyboard-manager.h		\
 	gsd-a11y-keyboard-manager.c		\
-	test-a11y-keyboard.c
+	main.c
 
 gsd_a11y_keyboard_CFLAGS =					\
 	-I$(top_srcdir)/gnome-settings-daemon			\
diff --git a/plugins/a11y-keyboard/test-a11y-keyboard.c b/plugins/a11y-keyboard/main.c
index 38ddef6b..f91cbda6 100644
--- a/plugins/a11y-keyboard/test-a11y-keyboard.c
+++ b/plugins/a11y-keyboard/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdA11yKeyboardManager
 #include "gsd-a11y-keyboard-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index afa55892..56cb6dc9 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -5,7 +5,7 @@ libexec_PROGRAMS = gsd-a11y-settings
 gsd_a11y_settings_SOURCES =	\
 	gsd-a11y-settings-manager.h	\
 	gsd-a11y-settings-manager.c	\
-	test-a11y-settings.c
+	main.c
 
 gsd_a11y_settings_CFLAGS =					\
 	-I$(top_srcdir)/gnome-settings-daemon			\
diff --git a/plugins/a11y-settings/test-a11y-settings.c b/plugins/a11y-settings/main.c
index 10b71284..aff6cd55 100644
--- a/plugins/a11y-settings/test-a11y-settings.c
+++ b/plugins/a11y-settings/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdA11ySettingsManager
 #include "gsd-a11y-settings-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index 2a3d74c7..4c577e80 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -38,7 +38,7 @@ libclipboard_la_LIBADD  = 	\
 
 libexec_PROGRAMS = gsd-clipboard
 gsd_clipboard_SOURCES =	\
-	test-clipboard.c	\
+	main.c			\
 	gsd-clipboard-manager.h	\
 	gsd-clipboard-manager.c	\
 	xutils.h		\
diff --git a/plugins/clipboard/test-clipboard.c b/plugins/clipboard/main.c
index 2761758a..596c31fd 100644
--- a/plugins/clipboard/test-clipboard.c
+++ b/plugins/clipboard/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdClipboardManager
 #include "gsd-clipboard-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index c177604c..a02cb069 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -67,7 +67,7 @@ TESTS = gcm-self-test
 
 libexec_PROGRAMS = gsd-color
 gsd_color_SOURCES =			\
-	test-color.c			\
+	main.c				\
 	gcm-edid.c			\
 	gcm-edid.h			\
 	gsd-color-calibrate.c		\
diff --git a/plugins/color/test-color.c b/plugins/color/main.c
index 12b00567..959d6a35 100644
--- a/plugins/color/test-color.c
+++ b/plugins/color/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdColorManager
 #include "gsd-color-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index d0c45155..13966abb 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -76,7 +76,7 @@ gsd_test_input_helper_SOURCES = test-input-helper.c
 gsd_test_input_helper_LDADD = libcommon.la
 gsd_test_input_helper_CFLAGS = $(libcommon_la_CFLAGS)
 
-EXTRA_DIST = $(scripts_DATA) test-plugin.h
+EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h
 
 CLEANFILES = \
 	$(GSD_COMMON_ENUM_FILES)
diff --git a/plugins/common/test-plugin.h b/plugins/common/daemon-skeleton.h
index 727b381f..7cd015dc 100644
--- a/plugins/common/test-plugin.h
+++ b/plugins/common/daemon-skeleton.h
@@ -1,12 +1,12 @@
 /**
- * Create a test app for your plugin quickly.
+ * Create a gnome-settings-daemon helper easily
  *
  * #define NEW gsd_media_keys_manager_new
  * #define START gsd_media_keys_manager_start
  * #define MANAGER GsdMediaKeysManager
  * #include "gsd-media-keys-manager.h"
  *
- * #include "test-plugin.h"
+ * #include "daemon-skeleton.h"
  */
 
 #include "config.h"
@@ -22,7 +22,7 @@
 #endif
 
 #ifndef PLUGIN_NAME
-#error Include PLUGIN_CFLAGS in the test application s CFLAGS
+#error Include PLUGIN_CFLAGS in the daemon s CFLAGS
 #endif /* !PLUGIN_NAME */
 
 static MANAGER *manager = NULL;
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index 46764191..d0e291ca 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -22,7 +22,7 @@ gsd_datetime_SOURCES =	\
 	gsd-datetime-manager.h	\
 	gsd-timezone-monitor.c	\
 	gsd-timezone-monitor.h	\
-	test-datetime.c		\
+	main.c			\
 	tz.c			\
 	tz.h			\
 	weather-tz.c		\
diff --git a/plugins/datetime/test-datetime.c b/plugins/datetime/main.c
index 0a55ba22..8950ab08 100644
--- a/plugins/datetime/test-datetime.c
+++ b/plugins/datetime/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdDatetimeManager
 #include "gsd-datetime-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index e9e9d80d..125dd4d6 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -27,7 +27,7 @@ libdummy_la_LIBADD  = 		\
 
 libexec_PROGRAMS = gsd-dummy
 gsd_dummy_SOURCES =			\
-	test-dummy.c			\
+	main.c				\
 	gsd-dummy-manager.c		\
 	gsd-dummy-manager.h
 
diff --git a/plugins/dummy/test-dummy.c b/plugins/dummy/main.c
index beb40fa5..a5a9c9d5 100644
--- a/plugins/dummy/test-dummy.c
+++ b/plugins/dummy/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdDummyManager
 #include "gsd-dummy-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index be45172b..233c8d79 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -41,7 +41,7 @@ gsd_purge_temp_test_CFLAGS =		\
 libexec_PROGRAMS = gsd-housekeeping
 
 gsd_housekeeping_SOURCES =		\
-	test-housekeeping.c		\
+	main.c				\
 	gsd-housekeeping-manager.c	\
 	gsd-housekeeping-manager.h	\
 	$(COMMON_FILES)
diff --git a/plugins/housekeeping/test-housekeeping.c b/plugins/housekeeping/main.c
index ee4ec2e9..89c12f7b 100644
--- a/plugins/housekeeping/test-housekeeping.c
+++ b/plugins/housekeeping/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdHousekeepingManager
 #include "gsd-housekeeping-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index cb9e10a2..d417063e 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -38,7 +38,7 @@ libkeyboard_la_LIBADD  =				\
 
 libexec_PROGRAMS = gsd-keyboard
 gsd_keyboard_SOURCES =		\
-	test-keyboard.c		\
+	main.c			\
 	gsd-keyboard-manager.h	\
 	gsd-keyboard-manager.c	\
 	$(NULL)
diff --git a/plugins/keyboard/test-keyboard.c b/plugins/keyboard/main.c
index 35b8880f..ab6df25b 100644
--- a/plugins/keyboard/test-keyboard.c
+++ b/plugins/keyboard/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdKeyboardManager
 #include "gsd-keyboard-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index c4c5428a..0ed0ad6a 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -88,7 +88,7 @@ gsd_media_keys_SOURCES =			\
 	bus-watch-namespace.h			\
 	mpris-controller.c			\
 	mpris-controller.h			\
-	test-media-keys.c			\
+	main.c					\
 	$(BUILT_SOURCES)			\
 	$(NULL)
 
diff --git a/plugins/media-keys/test-media-keys.c b/plugins/media-keys/main.c
index 2471563e..f2c4c157 100644
--- a/plugins/media-keys/test-media-keys.c
+++ b/plugins/media-keys/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdMediaKeysManager
 #include "gsd-media-keys-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 2e8e983d..63bf0b5e 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -55,7 +55,7 @@ gsd_locate_pointer_LDADD  = 		\
 libexec_PROGRAMS += gsd-mouse
 
 gsd_mouse_SOURCES =			\
-	test-mouse.c			\
+	main.c				\
 	gsd-mouse-manager.c		\
 	gsd-mouse-manager.h
 
diff --git a/plugins/mouse/test-mouse.c b/plugins/mouse/main.c
index d978dc9c..78665a13 100644
--- a/plugins/mouse/test-mouse.c
+++ b/plugins/mouse/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdMouseManager
 #include "gsd-mouse-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/orientation/Makefile.am b/plugins/orientation/Makefile.am
index a1d145ed..5ff05967 100644
--- a/plugins/orientation/Makefile.am
+++ b/plugins/orientation/Makefile.am
@@ -5,7 +5,7 @@ libexec_PROGRAMS = gsd-orientation
 gsd_orientation_SOURCES =		\
 	gsd-orientation-manager.h	\
 	gsd-orientation-manager.c	\
-	test-orientation.c
+	main.c
 
 gsd_orientation_CFLAGS =					\
 	-I$(top_srcdir)/gnome-settings-daemon			\
diff --git a/plugins/orientation/test-orientation.c b/plugins/orientation/main.c
index 766843a4..cc80cb15 100644
--- a/plugins/orientation/test-orientation.c
+++ b/plugins/orientation/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdOrientationManager
 #include "gsd-orientation-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index 6579108b..2a681ed6 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -75,7 +75,7 @@ gsd_power_SOURCES =				\
 	gsm-presence-flag.h				\
 	gsm-manager-logout-mode.h			\
 	gsd-power-constants.h				\
-	test-power.c
+	main.c
 
 gsd_power_CFLAGS = $(libpower_la_CFLAGS)
 gsd_power_CPPFLAGS = $(libpower_la_CPPFLAGS)
diff --git a/plugins/power/test-power.c b/plugins/power/main.c
index b4f54e34..f3fbc533 100644
--- a/plugins/power/test-power.c
+++ b/plugins/power/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdPowerManager
 #include "gsd-power-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am
index 9a1a4511..e3ae24de 100644
--- a/plugins/print-notifications/Makefile.am
+++ b/plugins/print-notifications/Makefile.am
@@ -54,7 +54,7 @@ libexec_PROGRAMS += gsd-print-notifications
 gsd_print_notifications_SOURCES =		\
 	gsd-print-notifications-manager.c	\
 	gsd-print-notifications-manager.h	\
-	test-print-notifications.c
+	main.c
 
 gsd_print_notifications_CPPFLAGS =				\
 	-I$(top_srcdir)/gnome-settings-daemon			\
diff --git a/plugins/print-notifications/test-print-notifications.c b/plugins/print-notifications/main.c
index e90d367e..a0dd4069 100644
--- a/plugins/print-notifications/test-print-notifications.c
+++ b/plugins/print-notifications/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdPrintNotificationsManager
 #include "gsd-print-notifications-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index 488eac55..ba04033a 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -8,7 +8,7 @@ gsd_rfkill_SOURCES =		\
 	rfkill-glib.c		\
 	rfkill-glib.h		\
 	rfkill.h		\
-	test-rfkill.c
+	main.c
 
 gsd_rfkill_CFLAGS =						\
 	-I$(top_srcdir)/gnome-settings-daemon			\
diff --git a/plugins/rfkill/test-rfkill.c b/plugins/rfkill/main.c
index 251b3138..4f19f5df 100644
--- a/plugins/rfkill/test-rfkill.c
+++ b/plugins/rfkill/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdRfkillManager
 #include "gsd-rfkill-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/screensaver-proxy/Makefile.am b/plugins/screensaver-proxy/Makefile.am
index e118ee3d..999008eb 100644
--- a/plugins/screensaver-proxy/Makefile.am
+++ b/plugins/screensaver-proxy/Makefile.am
@@ -25,7 +25,7 @@ libscreensaver_proxy_la_LIBADD  = $(SETTINGS_PLUGIN_LIBS)
 libexec_PROGRAMS = gsd-screensaver-proxy
 
 gsd_screensaver_proxy_SOURCES =				\
-	test-screensaver-proxy.c			\
+	main.c						\
 	gsd-screensaver-proxy-manager.c		\
 	gsd-screensaver-proxy-manager.h
 
diff --git a/plugins/screensaver-proxy/test-screensaver-proxy.c b/plugins/screensaver-proxy/main.c
index d5d9268e..3e3af274 100644
--- a/plugins/screensaver-proxy/test-screensaver-proxy.c
+++ b/plugins/screensaver-proxy/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdScreensaverProxyManager
 #include "gsd-screensaver-proxy-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/sharing/Makefile.am b/plugins/sharing/Makefile.am
index a5051c12..452598e4 100644
--- a/plugins/sharing/Makefile.am
+++ b/plugins/sharing/Makefile.am
@@ -29,7 +29,7 @@ noinst_PROGRAMS = gsd-sharing
 gsd_sharing_SOURCES =					\
 	gsd-sharing-manager.c				\
 	gsd-sharing-manager.h				\
-	test-sharing.c
+	main.c
 
 gsd_sharing_CFLAGS = $(libsharing_la_CFLAGS)
 gsd_sharing_CPPFLAGS = $(libsharing_la_CPPFLAGS)
diff --git a/plugins/sharing/test-sharing.c b/plugins/sharing/main.c
index ab0ab828..656e27d0 100644
--- a/plugins/sharing/test-sharing.c
+++ b/plugins/sharing/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdSharingManager
 #include "gsd-sharing-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index baf97160..760b34cf 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -30,7 +30,7 @@ gsd_smartcard_SOURCES =        \
 	gsd-smartcard-manager.c \
 	gsd-smartcard-utils.h \
 	gsd-smartcard-utils.c   \
-	test-smartcard.c
+	main.c
 
 nodist_gsd_smartcard_SOURCES = \
 	$(dbus_built_sources) \
diff --git a/plugins/smartcard/test-smartcard.c b/plugins/smartcard/main.c
index b5ee3d50..3552e5e1 100644
--- a/plugins/smartcard/test-smartcard.c
+++ b/plugins/smartcard/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdSmartcardManager
 #include "gsd-smartcard-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index c8fa2042..6c3e0a46 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -5,7 +5,7 @@ libexec_PROGRAMS = gsd-sound
 gsd_sound_SOURCES =		\
 	gsd-sound-manager.h	\
 	gsd-sound-manager.c	\
-	test-sound.c
+	main.c
 
 gsd_sound_CFLAGS =						\
 	-I$(top_srcdir)/gnome-settings-daemon			\
diff --git a/plugins/sound/test-sound.c b/plugins/sound/main.c
index a618b547..a170d48a 100644
--- a/plugins/sound/test-sound.c
+++ b/plugins/sound/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdSoundManager
 #include "gsd-sound-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index baced3a5..9502f441 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -90,7 +90,7 @@ EXTRA_DIST += org.gnome.settings-daemon.plugins.wacom.policy.in.in
 libexec_PROGRAMS += gsd-wacom gsd-list-wacom gsd-test-wacom-osd
 
 gsd_wacom_SOURCES =		\
-	test-wacom.c		\
+	main.c			\
 	gsd-wacom-manager.c	\
 	gsd-wacom-manager.h	\
 	gsd-wacom-key-shortcut-button.h	\
diff --git a/plugins/wacom/test-wacom.c b/plugins/wacom/main.c
index a6bb6f2e..ad1367c5 100644
--- a/plugins/wacom/test-wacom.c
+++ b/plugins/wacom/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdWacomManager
 #include "gsd-wacom-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index 9fe8a8c7..7467944f 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -32,7 +32,7 @@ uninstall-local:
 libexec_PROGRAMS = gsd-xrandr
 
 gsd_xrandr_SOURCES =		\
-	test-xrandr.c			\
+	main.c				\
 	gsd-xrandr-manager.c		\
 	gsd-xrandr-manager.h
 
diff --git a/plugins/xrandr/test-xrandr.c b/plugins/xrandr/main.c
index 96541a30..f223dcf4 100644
--- a/plugins/xrandr/test-xrandr.c
+++ b/plugins/xrandr/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GsdXrandrManager
 #include "gsd-xrandr-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index 93c6f6c0..34a84c91 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -83,7 +83,7 @@ gsd_xsettings_SOURCES =		\
 	gsd-remote-display-manager.h \
 	wm-button-layout-translation.c	\
 	wm-button-layout-translation.h	\
-	test-xsettings.c
+	main.c
 
 gsd_xsettings_CFLAGS = $(libxsettings_la_CFLAGS) $(PLUGIN_CFLAGS)
 gsd_xsettings_CPPFLAGS = $(libxsettings_la_CPPFLAGS) -I$(top_srcdir)/plugins/common
diff --git a/plugins/xsettings/test-xsettings.c b/plugins/xsettings/main.c
index c14ddc5f..57630984 100644
--- a/plugins/xsettings/test-xsettings.c
+++ b/plugins/xsettings/main.c
@@ -4,4 +4,4 @@
 #define MANAGER GnomeXSettingsManager
 #include "gsd-xsettings-manager.h"
 
-#include "test-plugin.h"
+#include "daemon-skeleton.h"