[gnome-settings-daemon] build: Add separate GTK+ skeleton
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-settings-daemon] build: Add separate GTK+ skeleton
- Date: Tue, 11 Oct 2016 09:12:49 +0000 (UTC)
commit 54b74317e51ce02665afee7d7fe85e475839492a
Author: Bastien Nocera <hadess hadess net>
Date: Tue Sep 27 17:25:32 2016 +0200
build: Add separate GTK+ skeleton
And simplify library requirements for each helper. This should allow
us to trim the number of dependencies for each one of the helpers. This
also moves the libnotify initialisation directly into the plugins that
need it.
https://bugzilla.gnome.org/show_bug.cgi?id=772370
configure.ac | 213 +++++++++++---------
gnome-settings-daemon/Makefile.am | 9 +-
plugins/a11y-keyboard/Makefile.am | 9 +-
plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c | 2 +
plugins/a11y-keyboard/main.c | 2 +-
plugins/a11y-settings/Makefile.am | 5 +-
plugins/clipboard/Makefile.am | 9 +-
plugins/clipboard/main.c | 2 +-
plugins/color/Makefile.am | 8 +-
plugins/color/main.c | 2 +-
plugins/common/Makefile.am | 16 +--
plugins/common/daemon-skeleton-gtk.h | 76 +++++++
plugins/common/daemon-skeleton.h | 24 ++-
plugins/datetime/Makefile.am | 7 +-
plugins/datetime/gsd-datetime-manager.c | 2 +
plugins/dummy/Makefile.am | 5 +-
plugins/dummy/gsd-dummy-manager.c | 5 +-
plugins/housekeeping/Makefile.am | 30 +--
plugins/housekeeping/gsd-housekeeping-manager.c | 3 +
plugins/housekeeping/main.c | 2 +-
plugins/keyboard/Makefile.am | 5 +-
plugins/keyboard/main.c | 2 +-
plugins/media-keys/Makefile.am | 9 +-
plugins/media-keys/main.c | 2 +-
plugins/mouse/Makefile.am | 23 +--
plugins/orientation/Makefile.am | 7 +-
plugins/orientation/gsd-orientation-manager.c | 1 -
plugins/power/Makefile.am | 7 +-
plugins/power/gsd-power-manager.c | 2 +
plugins/power/main.c | 2 +-
plugins/print-notifications/Makefile.am | 21 +--
.../gsd-print-notifications-manager.c | 2 +
plugins/print-notifications/main.c | 2 +-
plugins/rfkill/Makefile.am | 7 +-
plugins/screensaver-proxy/Makefile.am | 8 +-
plugins/sharing/Makefile.am | 7 +-
plugins/smartcard/Makefile.am | 8 +-
plugins/sound/Makefile.am | 7 +-
plugins/wacom/Makefile.am | 28 +--
plugins/wacom/gsd-wacom-manager.c | 2 +
plugins/wacom/main.c | 2 +-
plugins/xrandr/Makefile.am | 6 +-
plugins/xrandr/main.c | 2 +-
plugins/xsettings/Makefile.am | 43 +---
plugins/xsettings/main.c | 2 +-
45 files changed, 308 insertions(+), 330 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 33c445b..6974fc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,22 +61,6 @@ LCMS_REQUIRED_VERSION=2.2
EXTRA_COMPILE_WARNINGS(yes)
-PKG_CHECK_MODULES(SETTINGS_DAEMON,
- gtk+-3.0 >= $GTK_REQUIRED_VERSION
- gio-2.0 >= $GIO_REQUIRED_VERSION
- gmodule-2.0
- gthread-2.0
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
-)
-
-PKG_CHECK_MODULES(SETTINGS_PLUGIN,
- gtk+-3.0 >= $GTK_REQUIRED_VERSION
- gio-2.0 >= $GIO_REQUIRED_VERSION
- libnotify >= $LIBNOTIFY_REQUIRED_VERSION
- gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
- x11
-)
-
GSD_PLUGIN_LDFLAGS="-export_dynamic -module -avoid-version -no-undefined"
case $host_os in
darwin*)
@@ -88,6 +72,9 @@ AC_SUBST([GSD_PLUGIN_LDFLAGS])
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
+AC_CHECK_LIBM
+AC_SUBST(LIBM)
+
dnl ================================================================
dnl GSettings stuff
dnl ================================================================
@@ -100,18 +87,6 @@ dnl ---------------------------------------------------------------------------
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
dnl ---------------------------------------------------------------------------
-dnl - Check for libnotify
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED_VERSION,
- [have_libnotify=yes], have_libnotify=no)
-if test "x$have_libnotify" = xno ; then
- AC_MSG_ERROR([libnotify is required to build gnome-settings-daemon])
-fi
-AC_SUBST(LIBNOTIFY_CFLAGS)
-AC_SUBST(LIBNOTIFY_LIBS)
-
-dnl ---------------------------------------------------------------------------
dnl - GUdev integration (default enabled)
dnl ---------------------------------------------------------------------------
GUDEV_PKG=""
@@ -168,68 +143,83 @@ if test x$enable_wayland != xno; then
fi
fi
-dnl ---------------------------------------------------------------------------
-dnl - common
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(COMMON, x11 kbproto xi $GUDEV_PKG)
-
-dnl ---------------------------------------------------------------------------
-dnl - XTest
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(XTEST, x11 xtst)
-AC_SUBST(XTEST_CFLAGS)
-AC_SUBST(XTEST_LIBS)
-
-dnl ---------------------------------------------------------------------------
-dnl - mouse
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(MOUSE, x11 xi)
-
-dnl ---------------------------------------------------------------------------
-dnl - xsettings
-dnl ---------------------------------------------------------------------------
+dnl ================================================================
+dnl Plugins
+dnl ================================================================
-PKG_CHECK_MODULES(XSETTINGS, fontconfig gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
+PKG_CHECK_MODULES(A11Y_KEYBOARD,
+ gtk+-3.0
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
+ x11)
-dnl ---------------------------------------------------------------------------
-dnl - Housekeeping plugin stuff
-dnl ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(A11Y_SETTINGS,
+ gio-2.0
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION)
-PKG_CHECK_MODULES(GIOUNIX, [gio-unix-2.0])
+PKG_CHECK_MODULES(CLIPBOARD,
+ gtk+-x11-3.0
+ x11)
-dnl ---------------------------------------------------------------------------
-dnl - media-keys plugin stuff
-dnl ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(COLOR,
+ colord >= 1.0.2
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ libcanberra-gtk3
+ lcms2 >= $LCMS_REQUIRED_VERSION
+ libnotify)
-PKG_CHECK_MODULES(MEDIA_KEYS, [gio-unix-2.0 libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG
libpulse-mainloop-glib >= $PA_REQUIRED_VERSION libcanberra-gtk3 upower-glib >= $UPOWER_REQUIRED_VERSION])
-PKG_CHECK_MODULES(GVC, [gobject-2.0 libpulse >= $PA_REQUIRED_VERSION libpulse-mainloop-glib >=
$PA_REQUIRED_VERSION $ALSA_PKG])
+PKG_CHECK_MODULES(DATETIME,
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+ libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
+ geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
+ gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
+ polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION)
+
+PKG_CHECK_MODULES(DUMMY,
+ glib-2.0)
+
+PKG_CHECK_MODULES(HOUSEKEEPING,
+ gtk+-3.0
+ gio-unix-2.0
+ libnotify >= LIBNOTIFY_REQUIRED_VERSION)
+
+PKG_CHECK_MODULES(KEYBOARD,
+ gtk+-3.0)
+
+PKG_CHECK_MODULES(MEDIA_KEYS,
+ gio-unix-2.0
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
+ libpulse >= $PA_REQUIRED_VERSION
+ $GUDEV_PKG
+ libpulse-mainloop-glib >= $PA_REQUIRED_VERSION
+ libcanberra-gtk3
+ upower-glib >= $UPOWER_REQUIRED_VERSION)
+PKG_CHECK_MODULES(GVC,
+ gobject-2.0
+ libpulse >= $PA_REQUIRED_VERSION
+ libpulse-mainloop-glib >= $PA_REQUIRED_VERSION
+ $ALSA_PKG)
AM_CONDITIONAL(HAVE_INTROSPECTION, false)
-dnl ---------------------------------------------------------------------------
-dnl - xrandr plugin stuff
-dnl ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(MOUSE,
+ gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED_VERSION
+ gio-2.0)
-PKG_CHECK_MODULES(XRANDR, [gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION upower-glib >=
$UPOWER_REQUIRED_VERSION])
+PKG_CHECK_MODULES(MOUSE_LOCATE_POINTER,
+ gtk+-3.0
+ x11)
-dnl ---------------------------------------------------------------------------
-dnl - orientation plugin stuff
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(ORIENTATION, [gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION])
+PKG_CHECK_MODULES(ORIENTATION,
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION)
-dnl ---------------------------------------------------------------------------
-dnl - sound plugin stuff
-dnl ---------------------------------------------------------------------------
-
-PKG_CHECK_MODULES(SOUND, [libpulse >= $PA_REQUIRED_VERSION $GUDEV_PKG libpulse-mainloop-glib >=
$PA_REQUIRED_VERSION])
-
-# ---------------------------------------------------------------------------
-# Power
-# ---------------------------------------------------------------------------
-PKG_CHECK_MODULES(POWER, upower-glib >= $UPOWER_REQUIRED_VERSION gnome-desktop-3.0 >=
$GNOME_DESKTOP_REQUIRED_VERSION $GUDEV_PKG libcanberra-gtk3 libnotify x11 xext xtst)
+PKG_CHECK_MODULES(POWER,
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+ upower-glib >= $UPOWER_REQUIRED_VERSION
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ $GUDEV_PKG
+ libcanberra-gtk3
+ libnotify
+ x11 xext xtst)
if test x$have_gudev != xno; then
PKG_CHECK_MODULES(BACKLIGHT_HELPER,
@@ -238,36 +228,49 @@ if test x$have_gudev != xno; then
)
fi
-dnl ---------------------------------------------------------------------------
-dnl - color
-dnl ---------------------------------------------------------------------------
+PKG_CHECK_MODULES(PRINT_NOTIFICATIONS,
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+ gtk+-3.0)
+
+PKG_CHECK_MODULES(RFKILL,
+ gio-unix-2.0)
+
+PKG_CHECK_MODULES(SCREENSAVER_PROXY,
+ gio-2.0)
-PKG_CHECK_MODULES(COLOR, [colord >= 1.0.2 gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
libcanberra-gtk3 lcms2 >= $LCMS_REQUIRED_VERSION])
+PKG_CHECK_MODULES(SOUND,
+ libpulse >= $PA_REQUIRED_VERSION
+ libpulse-mainloop-glib >= $PA_REQUIRED_VERSION)
+
+PKG_CHECK_MODULES(XSETTINGS,
+ fontconfig
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ x11)
+
+PKG_CHECK_MODULES(XRANDR,
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ upower-glib >= $UPOWER_REQUIRED_VERSION)
dnl ---------------------------------------------------------------------------
-dnl - datetime
+dnl - XTest
dnl ---------------------------------------------------------------------------
-AC_CHECK_LIBM
-AC_SUBST(LIBM)
-
-PKG_CHECK_MODULES(DATETIME,
- libgeoclue-2.0 >= $GEOCLUE_REQUIRED_VERSION
- geocode-glib-1.0 >= $GEOCODE_GLIB_REQUIRED_VERSION
- gweather-3.0 >= $LIBGWEATHER_REQUIRED_VERSION
- polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION
-)
+PKG_CHECK_MODULES(XTEST, x11 xtst)
+AC_SUBST(XTEST_CFLAGS)
+AC_SUBST(XTEST_LIBS)
dnl ---------------------------------------------------------------------------
dnl - wacom (disabled for s390/s390x and non Linux platforms)
dnl ---------------------------------------------------------------------------
+LIBWACOM_PKG=""
case $host_os in
linux*)
if test "$host_cpu" = s390 -o "$host_cpu" = s390x; then
have_wacom=no
else
if test x$enable_gudev != xno; then
+ LIBWACOM_PKG="libwacom >= $LIBWACOM_REQUIRED_VERSION"
PKG_CHECK_MODULES(LIBWACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION])
PKG_CHECK_MODULES(WACOM, [libwacom >= $LIBWACOM_REQUIRED_VERSION x11 xi xtst gudev-1.0
gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION xorg-wacom librsvg-2.0 >= $LIBRSVG_REQUIRED_VERSION
libnotify >= $LIBNOTIFY_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION])
PKG_CHECK_MODULES(WACOM_OLED, [gudev-1.0])
@@ -284,6 +287,20 @@ case $host_os in
esac
AM_CONDITIONAL(HAVE_WACOM, test x$have_wacom = xyes)
+dnl ---------------------------------------------------------------------------
+dnl - common
+dnl ---------------------------------------------------------------------------
+
+PKG_CHECK_MODULES(COMMON,
+ gtk+-x11-3.0
+ gnome-desktop-3.0 >= $GNOME_DESKTOP_REQUIRED_VERSION
+ x11
+ kbproto
+ xi
+ $GUDEV_PKG
+ $LIBWACOM_PKG)
+PKG_CHECK_MODULES(HELPER, gio-unix-2.0)
+
dnl ==============================================
dnl smartcard section
dnl ==============================================
@@ -300,7 +317,7 @@ AC_ARG_ENABLE(smartcard-support,
if test x$WANT_SMARTCARD_SUPPORT = xyes ; then
NSS_REQUIRED_VERSION=3.11.2
- PKG_CHECK_MODULES(NSS, nss >= $NSS_REQUIRED_VERSION,
+ PKG_CHECK_MODULES(SMARTCARD, gio-unix-2.0 nss >= $NSS_REQUIRED_VERSION libnotify >=
$LIBNOTIFY_REQUIRED_VERSION,
[have_smartcard_support=true
AC_DEFINE(SMARTCARD_SUPPORT, 1, [Define if smartcard support should be enabled])],
[have_smartcard_support=false])
@@ -329,7 +346,6 @@ fi
AC_SUBST(NSS_DATABASE)
-
# ---------------------------------------------------------------------------
# CUPS
# ---------------------------------------------------------------------------
@@ -407,7 +423,10 @@ else
NM_MODULE=
fi
-PKG_CHECK_MODULES(SHARING, gio-2.0 $NM_MODULE)
+PKG_CHECK_MODULES(SHARING,
+ libnotify >= $LIBNOTIFY_REQUIRED_VERSION
+ gio-unix-2.0
+ $NM_MODULE)
# ---------------------------------------------------------------------------
# Enable Profiling
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index d1125d2..076cb44 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/gnome-settings-daemon/Makefile.am
@@ -5,11 +5,8 @@ AM_CPPFLAGS = \
-DDATADIR=\""$(datadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DLIBEXECDIR=\""$(libexecdir)"\" \
- -DGNOME_SETTINGS_PLUGINDIR=\""$(plugindir)"\" \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
- $(SETTINGS_DAEMON_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
$(GNOME_DESKTOP_CFLAGS) \
$(WAYLAND_CFLAGS) \
$(NULL)
@@ -73,12 +70,10 @@ libgsd_la_CPPFLAGS = \
$(DISABLE_DEPRECATED_CFLAGS) \
$(NULL)
-libgsd_la_CFLAGS = \
- $(NULL)
+libgsd_la_CFLAGS = $(HELPER_CFLAGS)
libgsd_la_LIBADD = \
- $(SETTINGS_DAEMON_LIBS) \
- $(GIOUNIX_LIBS) \
+ $(HELPER_LIBS) \
$(WAYLAND_LIBS) \
$(NULL)
diff --git a/plugins/a11y-keyboard/Makefile.am b/plugins/a11y-keyboard/Makefile.am
index a23d698..e57e882 100644
--- a/plugins/a11y-keyboard/Makefile.am
+++ b/plugins/a11y-keyboard/Makefile.am
@@ -14,17 +14,13 @@ gsd_a11y_keyboard_CFLAGS = \
-I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- -DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
$(PLUGIN_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(A11Y_KEYBOARD_CFLAGS)
gsd_a11y_keyboard_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(LIBNOTIFY_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(A11Y_KEYBOARD_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.A11yKeyboard.desktop.in
@@ -34,7 +30,6 @@ org.gnome.SettingsDaemon.A11yKeyboard.desktop: $(desktop_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
EXTRA_DIST = \
- $(gtkbuilder_DATA) \
$(desktop_in_files) \
$(NULL)
diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
index a697907..f83438d 100644
--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
@@ -796,6 +796,8 @@ gsd_a11y_keyboard_manager_class_init (GsdA11yKeyboardManagerClass *klass)
object_class->finalize = gsd_a11y_keyboard_manager_finalize;
+ notify_init ("gnome-settings-daemon");
+
g_type_class_add_private (klass, sizeof (GsdA11yKeyboardManagerPrivate));
}
diff --git a/plugins/a11y-keyboard/main.c b/plugins/a11y-keyboard/main.c
index f91cbda..e17712d 100644
--- a/plugins/a11y-keyboard/main.c
+++ b/plugins/a11y-keyboard/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdA11yKeyboardManager
#include "gsd-a11y-keyboard-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/a11y-settings/Makefile.am b/plugins/a11y-settings/Makefile.am
index c60b922..d27e7c2 100644
--- a/plugins/a11y-settings/Makefile.am
+++ b/plugins/a11y-settings/Makefile.am
@@ -13,13 +13,12 @@ gsd_a11y_settings_CFLAGS = \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(A11Y_SETTINGS_CFLAGS)
gsd_a11y_settings_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_PLUGIN_LIBS)
+ $(A11Y_SETTINGS_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.A11ySettings.desktop.in
diff --git a/plugins/clipboard/Makefile.am b/plugins/clipboard/Makefile.am
index c514415..3189ac6 100644
--- a/plugins/clipboard/Makefile.am
+++ b/plugins/clipboard/Makefile.am
@@ -13,8 +13,8 @@ gsd_clipboard_SOURCES = \
list.c \
$(NULL)
-gsd_clipboard_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
+gsd_clipboard_CFLAGS = \
+ $(CLIPBOARD_CFLAGS) \
$(AM_CFLAGS)
gsd_clipboard_CPPFLAGS = \
@@ -22,10 +22,9 @@ gsd_clipboard_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
- -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- $(AM_CPPFLAGS)
+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"
-gsd_clipboard_LDADD = $(SETTINGS_PLUGIN_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la
+gsd_clipboard_LDADD = $(CLIPBOARD_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.Clipboard.desktop.in
diff --git a/plugins/clipboard/main.c b/plugins/clipboard/main.c
index 596c31f..3c38d9b 100644
--- a/plugins/clipboard/main.c
+++ b/plugins/clipboard/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdClipboardManager
#include "gsd-clipboard-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
index 9d6091f..702c38c 100644
--- a/plugins/color/Makefile.am
+++ b/plugins/color/Makefile.am
@@ -8,7 +8,6 @@ gcm_self_test_CPPFLAGS = \
$(AM_CPPFLAGS)
gcm_self_test_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
$(COLOR_CFLAGS) \
$(PLUGIN_CFLAGS) \
$(AM_CFLAGS)
@@ -42,10 +41,7 @@ gsd_color_SOURCES = \
gsd_color_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(COLOR_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(AM_CFLAGS)
+ $(COLOR_CFLAGS)
gsd_color_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
@@ -58,8 +54,6 @@ gsd_color_CPPFLAGS = \
gsd_color_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(COLOR_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
- $(LIBNOTIFY_LIBS) \
$(LIBM)
desktopdir = $(sysconfdir)/xdg/autostart
diff --git a/plugins/color/main.c b/plugins/color/main.c
index 959d6a3..5dda3e7 100644
--- a/plugins/color/main.c
+++ b/plugins/color/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdColorManager
#include "gsd-color-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/common/Makefile.am b/plugins/common/Makefile.am
index 13966ab..8282cf1 100644
--- a/plugins/common/Makefile.am
+++ b/plugins/common/Makefile.am
@@ -49,25 +49,15 @@ endif
libcommon_la_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_builddir)/gnome-settings-daemon \
- -I$(top_srcdir)/data/ \
- $(AM_CPPFLAGS)
+ -I$(top_srcdir)/data/
-libcommon_la_CFLAGS = \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(COMMON_CFLAGS) \
- $(GNOME_DESKTOP_CFLAGS) \
- $(LIBWACOM_CFLAGS) \
- $(AM_CFLAGS)
+libcommon_la_CFLAGS = $(COMMON_CFLAGS)
libcommon_la_LDFLAGS = \
$(GSD_PLUGIN_LDFLAGS)
libcommon_la_LIBADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(SETTINGS_PLUGIN_LIBS) \
- $(GNOME_DESKTOP_LIBS) \
- $(LIBWACOM_LIBS) \
$(COMMON_LIBS)
libexec_PROGRAMS = gsd-test-input-helper
@@ -76,7 +66,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) daemon-skeleton.h
+EXTRA_DIST = $(scripts_DATA) daemon-skeleton.h daemon-skeleton-gtk.h
CLEANFILES = \
$(GSD_COMMON_ENUM_FILES)
diff --git a/plugins/common/daemon-skeleton-gtk.h b/plugins/common/daemon-skeleton-gtk.h
new file mode 100644
index 0000000..fc658a4
--- /dev/null
+++ b/plugins/common/daemon-skeleton-gtk.h
@@ -0,0 +1,76 @@
+/**
+ * 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 "daemon-skeleton-gtk.h"
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include <glib/gi18n.h>
+#include <gtk/gtk.h>
+
+#ifndef PLUGIN_NAME
+#error Include PLUGIN_CFLAGS in the daemon s CFLAGS
+#endif /* !PLUGIN_NAME */
+
+static MANAGER *manager = NULL;
+static int timeout = -1;
+static gboolean verbose = FALSE;
+
+static GOptionEntry entries[] = {
+ { "exit-time", 0, 0, G_OPTION_ARG_INT, &timeout, "Exit after n seconds time", NULL },
+ { "verbose", 'v', 0, G_OPTION_ARG_NONE, &verbose, "Verbose", NULL },
+ {NULL}
+};
+
+int
+main (int argc, char **argv)
+{
+ GError *error;
+
+ bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
+ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+ textdomain (GETTEXT_PACKAGE);
+
+ gdk_set_allowed_backends ("x11");
+
+ error = NULL;
+ if (! gtk_init_with_args (&argc, &argv, PLUGIN_NAME, entries, NULL, &error)) {
+ fprintf (stderr, "%s\n", error->message);
+ g_error_free (error);
+ exit (1);
+ }
+
+ if (verbose)
+ g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
+
+ if (timeout > 0) {
+ guint id;
+ id = g_timeout_add_seconds (timeout, (GSourceFunc) gtk_main_quit, NULL);
+ g_source_set_name_by_id (id, "[gnome-settings-daemon] gtk_main_quit");
+ }
+
+ manager = NEW ();
+
+ error = NULL;
+ if (!START (manager, &error)) {
+ fprintf (stderr, "Failed to start: %s\n", error->message);
+ g_error_free (error);
+ exit (1);
+ }
+
+ gtk_main ();
+
+ STOP (manager);
+ g_object_unref (manager);
+
+ return 0;
+}
diff --git a/plugins/common/daemon-skeleton.h b/plugins/common/daemon-skeleton.h
index 449368a..d065c48 100644
--- a/plugins/common/daemon-skeleton.h
+++ b/plugins/common/daemon-skeleton.h
@@ -12,10 +12,9 @@
#include "config.h"
#include <stdlib.h>
+#include <stdio.h>
#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-#include <libnotify/notify.h>
#ifndef PLUGIN_NAME
#error Include PLUGIN_CFLAGS in the daemon s CFLAGS
@@ -34,29 +33,32 @@ static GOptionEntry entries[] = {
int
main (int argc, char **argv)
{
- GError *error;
+ GError *error = NULL;
+ GOptionContext *context;
+ GMainLoop *loop;
bindtextdomain (GETTEXT_PACKAGE, GNOME_SETTINGS_LOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
- notify_init ("gnome-settings-daemon");
- gdk_set_allowed_backends ("x11");
-
- error = NULL;
- if (! gtk_init_with_args (&argc, &argv, PLUGIN_NAME, entries, NULL, &error)) {
+ context = g_option_context_new (NULL);
+ g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE);
+ if (!g_option_context_parse (context, &argc, &argv, &error)) {
fprintf (stderr, "%s\n", error->message);
g_error_free (error);
exit (1);
}
+ g_option_context_free (context);
+
+ loop = g_main_loop_new (NULL, FALSE);
if (verbose)
g_setenv ("G_MESSAGES_DEBUG", "all", TRUE);
if (timeout > 0) {
guint id;
- id = g_timeout_add_seconds (timeout, (GSourceFunc) gtk_main_quit, NULL);
- g_source_set_name_by_id (id, "[gnome-settings-daemon] gtk_main_quit");
+ id = g_timeout_add_seconds (timeout, (GSourceFunc) g_main_loop_quit, loop);
+ g_source_set_name_by_id (id, "[gnome-settings-daemon] g_main_loop_quit");
}
manager = NEW ();
@@ -68,7 +70,7 @@ main (int argc, char **argv)
exit (1);
}
- gtk_main ();
+ g_main_loop_run (loop);
STOP (manager);
g_object_unref (manager);
diff --git a/plugins/datetime/Makefile.am b/plugins/datetime/Makefile.am
index 869a81f..48ba891 100644
--- a/plugins/datetime/Makefile.am
+++ b/plugins/datetime/Makefile.am
@@ -35,16 +35,13 @@ gsd_datetime_CFLAGS = \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
$(DATETIME_CFLAGS) \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(PLUGIN_CFLAGS)
gsd_datetime_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
$(DATETIME_LIBS) \
- $(LIBM) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(LIBM)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.Datetime.desktop.in
diff --git a/plugins/datetime/gsd-datetime-manager.c b/plugins/datetime/gsd-datetime-manager.c
index 98f9461..7516c89 100644
--- a/plugins/datetime/gsd-datetime-manager.c
+++ b/plugins/datetime/gsd-datetime-manager.c
@@ -185,6 +185,8 @@ gsd_datetime_manager_class_init (GsdDatetimeManagerClass *klass)
object_class->finalize = gsd_datetime_manager_finalize;
+ notify_init ("gnome-settings-daemon");
+
g_type_class_add_private (klass, sizeof (GsdDatetimeManagerPrivate));
}
diff --git a/plugins/dummy/Makefile.am b/plugins/dummy/Makefile.am
index 506ded5..0414439 100644
--- a/plugins/dummy/Makefile.am
+++ b/plugins/dummy/Makefile.am
@@ -8,8 +8,7 @@ gsd_dummy_SOURCES = \
gsd_dummy_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(DUMMY_CFLAGS)
gsd_dummy_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
@@ -18,7 +17,7 @@ gsd_dummy_CPPFLAGS = \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(AM_CPPFLAGS)
-gsd_dummy_LDADD = $(SETTINGS_PLUGIN_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la
+gsd_dummy_LDADD = $(DUMMY_LIBS) $(top_builddir)/gnome-settings-daemon/libgsd.la
EXTRA_DIST = $(NULL)
diff --git a/plugins/dummy/gsd-dummy-manager.c b/plugins/dummy/gsd-dummy-manager.c
index 509ab0f..5e5f945 100644
--- a/plugins/dummy/gsd-dummy-manager.c
+++ b/plugins/dummy/gsd-dummy-manager.c
@@ -22,10 +22,7 @@
#include <string.h>
#include <locale.h>
-#include <glib.h>
-#include <glib/gi18n.h>
-#include <gdk/gdk.h>
-#include <gtk/gtk.h>
+#include <glib-object.h>
#include "gnome-settings-profile.h"
#include "gsd-dummy-manager.h"
diff --git a/plugins/housekeeping/Makefile.am b/plugins/housekeeping/Makefile.am
index 4e99f46..3841edf 100644
--- a/plugins/housekeeping/Makefile.am
+++ b/plugins/housekeeping/Makefile.am
@@ -11,32 +11,21 @@ noinst_PROGRAMS = gsd-disk-space-test gsd-empty-trash-test gsd-purge-temp-test
gsd_disk_space_test_SOURCES = \
gsd-disk-space-test.c \
$(COMMON_FILES)
-gsd_disk_space_test_LDADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
+gsd_disk_space_test_LDADD = $(HOUSEKEEPING_LIBS)
gsd_disk_space_test_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(GIOUNIX_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(AM_CFLAGS)
+ $(HOUSEKEEPING_CFLAGS)
gsd_empty_trash_test_SOURCES = \
gsd-empty-trash-test.c \
$(COMMON_FILES)
-gsd_empty_trash_test_LDADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
-gsd_empty_trash_test_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(GIOUNIX_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(AM_CFLAGS)
+gsd_empty_trash_test_LDADD = $(HOUSEKEEPING_LIBS)
+gsd_empty_trash_test_CFLAGS = $(HOUSEKEEPING_CFLAGS)
gsd_purge_temp_test_SOURCES = \
gsd-purge-temp-test.c \
$(COMMON_FILES)
-gsd_purge_temp_test_LDADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
-gsd_purge_temp_test_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(GIOUNIX_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
- $(AM_CFLAGS)
+gsd_purge_temp_test_LDADD = $(HOUSEKEEPING_LIBS)
+gsd_purge_temp_test_CFLAGS = $(HOUSEKEEPING_CFLAGS)
libexec_PROGRAMS = gsd-housekeeping
@@ -57,15 +46,12 @@ gsd_housekeeping_CPPFLAGS = \
gsd_housekeeping_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(MOUSE_CFLAGS) \
- $(AM_CFLAGS)
+ $(HOUSEKEEPING_CFLAGS)
gsd_housekeeping_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(HOUSEKEEPING_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.Housekeeping.desktop.in
diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c
index aa3c769..7a837cf 100644
--- a/plugins/housekeeping/gsd-housekeeping-manager.c
+++ b/plugins/housekeeping/gsd-housekeeping-manager.c
@@ -21,6 +21,7 @@
#include <gio/gio.h>
#include <glib/gstdio.h>
#include <string.h>
+#include <libnotify/notify.h>
#include "gnome-settings-profile.h"
#include "gsd-housekeeping-manager.h"
@@ -454,6 +455,8 @@ gsd_housekeeping_manager_class_init (GsdHousekeepingManagerClass *klass)
object_class->finalize = gsd_housekeeping_manager_finalize;
+ notify_init ("gnome-settings-daemon");
+
g_type_class_add_private (klass, sizeof (GsdHousekeepingManagerPrivate));
}
diff --git a/plugins/housekeeping/main.c b/plugins/housekeeping/main.c
index 89c12f7..5ccd83d 100644
--- a/plugins/housekeeping/main.c
+++ b/plugins/housekeeping/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdHousekeepingManager
#include "gsd-housekeeping-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/keyboard/Makefile.am b/plugins/keyboard/Makefile.am
index 624d43f..e4e6dfe 100644
--- a/plugins/keyboard/Makefile.am
+++ b/plugins/keyboard/Makefile.am
@@ -11,8 +11,7 @@ gsd_keyboard_SOURCES = \
gsd_keyboard_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(KEYBOARD_CFLAGS)
gsd_keyboard_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
@@ -26,7 +25,7 @@ gsd_keyboard_CPPFLAGS = \
gsd_keyboard_LDADD = \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_PLUGIN_LIBS)
+ $(KEYBOARD_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.Keyboard.desktop.in
diff --git a/plugins/keyboard/main.c b/plugins/keyboard/main.c
index ab6df25..48fce06 100644
--- a/plugins/keyboard/main.c
+++ b/plugins/keyboard/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdKeyboardManager
#include "gsd-keyboard-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/media-keys/Makefile.am b/plugins/media-keys/Makefile.am
index 8e5e41b..3b860bc 100644
--- a/plugins/media-keys/Makefile.am
+++ b/plugins/media-keys/Makefile.am
@@ -66,18 +66,13 @@ gsd_media_keys_CPPFLAGS = \
gsd_media_keys_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(MEDIA_KEYS_CFLAGS) \
- $(AM_CFLAGS)
+ $(MEDIA_KEYS_CFLAGS)
gsd_media_keys_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
$(top_builddir)/plugins/media-keys/gvc/libgvc.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
- $(MEDIA_KEYS_LIBS) \
- -lm
+ $(MEDIA_KEYS_LIBS) -lm
EXTRA_DIST = \
gsd-marshal.list \
diff --git a/plugins/media-keys/main.c b/plugins/media-keys/main.c
index f2c4c15..fab28f6 100644
--- a/plugins/media-keys/main.c
+++ b/plugins/media-keys/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdMediaKeysManager
#include "gsd-media-keys-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/mouse/Makefile.am b/plugins/mouse/Makefile.am
index 8058468..d30470e 100644
--- a/plugins/mouse/Makefile.am
+++ b/plugins/mouse/Makefile.am
@@ -15,15 +15,9 @@ gsd_locate_pointer_SOURCES = \
gsd-timeline.h \
gsd-timeline.c
-gsd_locate_pointer_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(MOUSE_CFLAGS) \
- $(AM_CFLAGS)
+gsd_locate_pointer_CFLAGS = $(MOUSE_LOCATE_POINTER_CFLAGS)
-gsd_locate_pointer_LDADD = \
- $(SETTINGS_PLUGIN_LIBS) \
- $(MOUSE_LIBS) \
- -lm
+gsd_locate_pointer_LDADD = $(MOUSE_LOCATE_POINTER_LIBS) -lm
libexec_PROGRAMS += gsd-mouse
@@ -41,19 +35,14 @@ gsd_mouse_CPPFLAGS = \
-DLIBEXECDIR=\""$(libexecdir)"\" \
$(AM_CPPFLAGS)
-gsd_mouse_CFLAGS = \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(MOUSE_CFLAGS) \
- $(AM_CFLAGS)
+gsd_mouse_CFLAGS = \
+ $(PLUGIN_CFLAGS) \
+ $(MOUSE_CFLAGS)
gsd_mouse_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
- $(MOUSE_LIBS) \
- -lm
+ $(MOUSE_LIBS) -lm
EXTRA_DIST = $(desktop_in_files)
CLEANFILES = $(desktop_DATA)
diff --git a/plugins/orientation/Makefile.am b/plugins/orientation/Makefile.am
index 8ce1139..3abc36b 100644
--- a/plugins/orientation/Makefile.am
+++ b/plugins/orientation/Makefile.am
@@ -13,15 +13,12 @@ gsd_orientation_CFLAGS = \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(ORIENTATION_CFLAGS) \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(PLUGIN_CFLAGS)
gsd_orientation_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(ORIENTATION_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(ORIENTATION_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.Orientation.desktop.in
diff --git a/plugins/orientation/gsd-orientation-manager.c b/plugins/orientation/gsd-orientation-manager.c
index 8b10394..6318491 100644
--- a/plugins/orientation/gsd-orientation-manager.c
+++ b/plugins/orientation/gsd-orientation-manager.c
@@ -22,7 +22,6 @@
#include "config.h"
-#include <gtk/gtk.h>
#include <gdk/gdk.h>
#define GNOME_DESKTOP_USE_UNSTABLE_API
diff --git a/plugins/power/Makefile.am b/plugins/power/Makefile.am
index 586ba43..816cc4d 100644
--- a/plugins/power/Makefile.am
+++ b/plugins/power/Makefile.am
@@ -39,9 +39,7 @@ gsd_power_SOURCES = \
gsd_power_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(POWER_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(POWER_CFLAGS)
gsd_power_CPPFLAGS = \
-I$(top_srcdir)/data/ \
@@ -58,8 +56,7 @@ gsd_power_LDADD = \
-lm \
$(top_builddir)/plugins/common/libcommon.la \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(POWER_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(POWER_LIBS)
EXTRA_DIST = \
$(desktop_in_files) \
diff --git a/plugins/power/gsd-power-manager.c b/plugins/power/gsd-power-manager.c
index e55ad3c..8196789 100644
--- a/plugins/power/gsd-power-manager.c
+++ b/plugins/power/gsd-power-manager.c
@@ -1894,6 +1894,8 @@ gsd_power_manager_class_init (GsdPowerManagerClass *klass)
object_class->finalize = gsd_power_manager_finalize;
+ notify_init ("gnome-settings-daemon");
+
g_type_class_add_private (klass, sizeof (GsdPowerManagerPrivate));
}
diff --git a/plugins/power/main.c b/plugins/power/main.c
index f3fbc53..4b851ed 100644
--- a/plugins/power/main.c
+++ b/plugins/power/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdPowerManager
#include "gsd-power-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/print-notifications/Makefile.am b/plugins/print-notifications/Makefile.am
index 98b105d..0e6b6d7 100644
--- a/plugins/print-notifications/Makefile.am
+++ b/plugins/print-notifications/Makefile.am
@@ -13,15 +13,13 @@ gsd_printer_SOURCES = \
gsd-printer.c
gsd_printer_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(LIBNOTIFY_CFLAGS) \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
+ $(PRINT_NOTIFICATIONS_CFLAGS) \
$(AM_CFLAGS)
-gsd_printer_LDADD = \
- $(SETTINGS_PLUGIN_LIBS) \
- $(CUPS_LIBS) \
- $(LIBNOTIFY_LIBS)
+gsd_printer_LDADD = \
+ $(PRINT_NOTIFICATIONS_LIBS) \
+ $(CUPS_LIBS)
libexec_PROGRAMS += gsd-print-notifications
@@ -39,17 +37,14 @@ gsd_print_notifications_CPPFLAGS = \
$(AM_CPPFLAGS) \
$(CUPS_CPPFLAGS)
-gsd_print_notifications_CFLAGS = \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+gsd_print_notifications_CFLAGS = \
+ $(PLUGIN_CFLAGS) \
+ $(PRINT_NOTIFICATIONS_CFLAGS)
gsd_print_notifications_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
$(CUPS_LIBS) \
- $(LIBNOTIFY_LIBS)
+ $(PRINT_NOTIFICATIONS_LIBS)
EXTRA_DIST = \
$(desktop_in_files)
diff --git a/plugins/print-notifications/gsd-print-notifications-manager.c
b/plugins/print-notifications/gsd-print-notifications-manager.c
index c322f84..6ffa979 100644
--- a/plugins/print-notifications/gsd-print-notifications-manager.c
+++ b/plugins/print-notifications/gsd-print-notifications-manager.c
@@ -1473,6 +1473,8 @@ gsd_print_notifications_manager_class_init (GsdPrintNotificationsManagerClass *k
object_class->finalize = gsd_print_notifications_manager_finalize;
+ notify_init ("gnome-settings-daemon");
+
g_type_class_add_private (klass, sizeof (GsdPrintNotificationsManagerPrivate));
}
diff --git a/plugins/print-notifications/main.c b/plugins/print-notifications/main.c
index a0dd406..57155d0 100644
--- a/plugins/print-notifications/main.c
+++ b/plugins/print-notifications/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdPrintNotificationsManager
#include "gsd-print-notifications-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/rfkill/Makefile.am b/plugins/rfkill/Makefile.am
index 8c28b1c..3c5ec47 100644
--- a/plugins/rfkill/Makefile.am
+++ b/plugins/rfkill/Makefile.am
@@ -12,17 +12,16 @@ gsd_rfkill_SOURCES = \
gsd_rfkill_CFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
- -I$(top_builddir)/gnome-settings-daemon \
+ -I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(RFKILL_CFLAGS)
gsd_rfkill_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_PLUGIN_LIBS)
+ $(RFKILL_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.Rfkill.desktop.in
diff --git a/plugins/screensaver-proxy/Makefile.am b/plugins/screensaver-proxy/Makefile.am
index e35cd55..3c9de44 100644
--- a/plugins/screensaver-proxy/Makefile.am
+++ b/plugins/screensaver-proxy/Makefile.am
@@ -13,19 +13,17 @@ gsd_screensaver_proxy_CPPFLAGS = \
-I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- $(AM_CPPFLAGS)
+ -DLIBEXECDIR=\""$(libexecdir)"\"
gsd_screensaver_proxy_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
+ $(SCREENSAVER_PROXY_CFLAGS) \
$(AM_CFLAGS)
gsd_screensaver_proxy_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(SCREENSAVER_PROXY_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.ScreensaverProxy.desktop.in
diff --git a/plugins/sharing/Makefile.am b/plugins/sharing/Makefile.am
index be94e28..df99688 100644
--- a/plugins/sharing/Makefile.am
+++ b/plugins/sharing/Makefile.am
@@ -10,9 +10,7 @@ gsd_sharing_SOURCES = \
gsd_sharing_CFLAGS = \
-I$(top_srcdir)/plugins/common \
$(SHARING_CFLAGS) \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(PLUGIN_CFLAGS)
gsd_sharing_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_builddir)/gnome-settings-daemon \
@@ -20,8 +18,7 @@ gsd_sharing_CPPFLAGS = \
$(AM_CPPFLAGS)
gsd_sharing_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(SHARING_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(SHARING_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.Sharing.desktop.in
diff --git a/plugins/smartcard/Makefile.am b/plugins/smartcard/Makefile.am
index 7724d27..90e2d22 100644
--- a/plugins/smartcard/Makefile.am
+++ b/plugins/smartcard/Makefile.am
@@ -47,17 +47,13 @@ gsd_smartcard_CPPFLAGS = \
gsd_smartcard_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(MEDIA_KEYS_CFLAGS) \
- $(NSS_CFLAGS) \
+ $(SMARTCARD_CFLAGS) \
$(AM_CFLAGS)
gsd_smartcard_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(NSS_LIBS) \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(SMARTCARD_LIBS)
libsmartcard_la_SOURCES = \
diff --git a/plugins/sound/Makefile.am b/plugins/sound/Makefile.am
index dfe6baf..472bdbf 100644
--- a/plugins/sound/Makefile.am
+++ b/plugins/sound/Makefile.am
@@ -13,15 +13,12 @@ gsd_sound_CFLAGS = \
-I$(top_srcdir)/plugins/common \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
$(SOUND_CFLAGS) \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+ $(PLUGIN_CFLAGS)
gsd_sound_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SOUND_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(SOUND_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
desktop_in_files = org.gnome.SettingsDaemon.Sound.desktop.in
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am
index 646dc88..0180711 100644
--- a/plugins/wacom/Makefile.am
+++ b/plugins/wacom/Makefile.am
@@ -72,20 +72,15 @@ gsd_wacom_CPPFLAGS = \
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- $(AM_CPPFLAGS)
+ -DLIBEXECDIR=\""$(libexecdir)"\"
gsd_wacom_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(WACOM_CFLAGS) \
- $(AM_CFLAGS)
+ $(WACOM_CFLAGS)
gsd_wacom_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
$(WACOM_LIBS) \
-lm
@@ -102,19 +97,13 @@ gsd_list_wacom_CPPFLAGS = \
-DBINDIR=\"$(bindir)\" \
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
- -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- $(AM_CPPFLAGS)
+ -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\"
-gsd_list_wacom_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(WACOM_CFLAGS) \
- $(AM_CFLAGS)
+gsd_list_wacom_CFLAGS = $(WACOM_CFLAGS)
gsd_list_wacom_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
$(WACOM_LIBS) \
-lm
@@ -139,19 +128,14 @@ gsd_test_wacom_osd_CPPFLAGS = \
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGTKBUILDERDIR=\""$(pkgdatadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- -DLIBEXECDIR=\""$(libexecdir)"\" \
- $(AM_CPPFLAGS)
+ -DLIBEXECDIR=\""$(libexecdir)"\"
gsd_test_wacom_osd_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(WACOM_CFLAGS) \
- $(AM_CFLAGS)
+ $(WACOM_CFLAGS)
gsd_test_wacom_osd_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
$(WACOM_LIBS) \
-lm
diff --git a/plugins/wacom/gsd-wacom-manager.c b/plugins/wacom/gsd-wacom-manager.c
index ca11dd4..9ddfd73 100644
--- a/plugins/wacom/gsd-wacom-manager.c
+++ b/plugins/wacom/gsd-wacom-manager.c
@@ -149,6 +149,8 @@ gsd_wacom_manager_class_init (GsdWacomManagerClass *klass)
object_class->finalize = gsd_wacom_manager_finalize;
+ notify_init ("gnome-settings-daemon");
+
g_type_class_add_private (klass, sizeof (GsdWacomManagerPrivate));
}
diff --git a/plugins/wacom/main.c b/plugins/wacom/main.c
index ad1367c..a19a71b 100644
--- a/plugins/wacom/main.c
+++ b/plugins/wacom/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdWacomManager
#include "gsd-wacom-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/xrandr/Makefile.am b/plugins/xrandr/Makefile.am
index 8bda44f..a9c277e 100644
--- a/plugins/xrandr/Makefile.am
+++ b/plugins/xrandr/Makefile.am
@@ -47,15 +47,11 @@ gsd_xrandr_CPPFLAGS = \
gsd_xrandr_CFLAGS = \
$(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(XRANDR_CFLAGS) \
- $(AM_CFLAGS)
+ $(XRANDR_CFLAGS)
gsd_xrandr_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(SETTINGS_DAEMON_LIBS) \
- $(SETTINGS_PLUGIN_LIBS) \
$(XRANDR_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
diff --git a/plugins/xrandr/main.c b/plugins/xrandr/main.c
index f223dcf..45305a2 100644
--- a/plugins/xrandr/main.c
+++ b/plugins/xrandr/main.c
@@ -4,4 +4,4 @@
#define MANAGER GsdXrandrManager
#include "gsd-xrandr-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am
index d2ac425..7420429 100644
--- a/plugins/xsettings/Makefile.am
+++ b/plugins/xsettings/Makefile.am
@@ -9,23 +9,18 @@ test_gtk_modules_SOURCES = \
gsd-xsettings-gtk.h \
test-gtk-modules.c
-test_gtk_modules_CFLAGS = \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+test_gtk_modules_CFLAGS = $(PLUGIN_CFLAGS) $(XSETTINGS_CFLAGS)
test_gtk_modules_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(XSETTINGS_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+ $(XSETTINGS_LIBS)
test_gtk_modules_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/data/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
- $(AM_CPPFLAGS)
+ -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\"
noinst_PROGRAMS += test-fontconfig-monitor
@@ -33,38 +28,26 @@ test_fontconfig_monitor_SOURCES = \
fontconfig-monitor.c \
fontconfig-monitor.h
-test_fontconfig_monitor_CFLAGS = \
- $(PLUGIN_CFLAGS) \
- $(SETTINGS_PLUGIN_CFLAGS) \
- $(AM_CFLAGS)
+test_fontconfig_monitor_CFLAGS = $(PLUGIN_CFLAGS) $(XSETTINGS_CFLAGS)
-test_fontconfig_monitor_LDADD = \
- $(XSETTINGS_LIBS) \
- $(SETTINGS_PLUGIN_LIBS)
+test_fontconfig_monitor_LDADD = $(XSETTINGS_LIBS)
test_fontconfig_monitor_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_builddir)/gnome-settings-daemon \
-I$(top_srcdir)/data/ \
- -DFONTCONFIG_MONITOR_TEST \
- $(AM_CPPFLAGS)
+ -DFONTCONFIG_MONITOR_TEST
noinst_PROGRAMS += test-wm-button-layout-translations
test_wm_button_layout_translations_SOURCES = \
test-wm-button-layout-translations.c \
wm-button-layout-translation.c \
- wm-button-layout-translation.h \
- $(NULL)
+ wm-button-layout-translation.h
-test_wm_button_layout_translations_CFLAGS = \
- $(XSETTINGS_CFLAGS) \
- $(AM_CFLAGS) \
- $(NULL)
+test_wm_button_layout_translations_CFLAGS = $(XSETTINGS_CFLAGS)
-test_wm_button_layout_translations_LDADD = \
- $(XSETTINGS_LIBS) \
- $(NULL)
+test_wm_button_layout_translations_LDADD = $(XSETTINGS_LIBS)
libexec_PROGRAMS = gsd-xsettings
@@ -87,10 +70,8 @@ gsd_xsettings_SOURCES = \
main.c
gsd_xsettings_CFLAGS = \
- $(SETTINGS_PLUGIN_CFLAGS) \
$(PLUGIN_CFLAGS) \
- $(XSETTINGS_CFLAGS) \
- $(AM_CFLAGS)
+ $(XSETTINGS_CFLAGS)
gsd_xsettings_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
@@ -98,12 +79,10 @@ gsd_xsettings_CPPFLAGS =
\
-I$(top_srcdir)/plugins/common/ \
-I$(top_srcdir)/data/ \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
- -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\" \
- $(AM_CPPFLAGS)
+ -DGTK_MODULES_DIRECTORY=\""$(libdir)/gnome-settings-daemon-@GSD_API_VERSION@/gtk-modules/"\"
gsd_xsettings_LDADD = \
$(top_builddir)/gnome-settings-daemon/libgsd.la \
- $(SETTINGS_PLUGIN_LIBS) \
$(XSETTINGS_LIBS)
desktopdir = $(sysconfdir)/xdg/autostart
diff --git a/plugins/xsettings/main.c b/plugins/xsettings/main.c
index 5763098..67501ae 100644
--- a/plugins/xsettings/main.c
+++ b/plugins/xsettings/main.c
@@ -4,4 +4,4 @@
#define MANAGER GnomeXSettingsManager
#include "gsd-xsettings-manager.h"
-#include "daemon-skeleton.h"
+#include "daemon-skeleton-gtk.h"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
