diff options
| author | Bastien Nocera <hadess@hadess.net> | 2016-09-27 17:25:32 +0200 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2016-10-11 11:00:56 +0200 |
| commit | 54b74317e51ce02665afee7d7fe85e475839492a (patch) | |
| tree | a78ca181dbf5ea5f66612137ab7f621231809b4f /plugins/wacom | |
| parent | f5ef6bd9d1166a9457304409f58b6f0d2ba15cd4 (diff) | |
| download | gnome-settings-daemon-54b74317e51ce02665afee7d7fe85e475839492a.tar.gz | |
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
Diffstat (limited to 'plugins/wacom')
| -rw-r--r-- | plugins/wacom/Makefile.am | 28 | ||||
| -rw-r--r-- | plugins/wacom/gsd-wacom-manager.c | 2 | ||||
| -rw-r--r-- | plugins/wacom/main.c | 2 |
3 files changed, 9 insertions, 23 deletions
diff --git a/plugins/wacom/Makefile.am b/plugins/wacom/Makefile.am index 646dc880..01807119 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 ca11dd4e..9ddfd739 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 ad1367c5..a19a71bb 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" |