3 files changed, 4 insertions, 10 deletions
diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am
index 7dc0639..be3c407 100644
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@@ -2,6 +2,7 @@ libexec_PROGRAMS = mate-notification-daemon
 
 mate_notification_daemon_SOURCES = \
 $(mate_notification_daemon_built_sources) \
+ ../common/constants.h \
 daemon.c \
 daemon.h \
 engines.c \
@@ -36,6 +37,7 @@ $(mate_notification_daemon_built_sources) : Makefile.am $(srcdir)/notificationda
 
 AM_CPPFLAGS = \
 -I$(top_srcdir) \
+ -I$(top_srcdir)/src/common \
 $(NOTIFICATION_DAEMON_CFLAGS) \
 -DENGINES_DIR=\"$(libdir)/mate-notification-daemon/engines\"
 
diff --git a/src/daemon/daemon.c b/src/daemon/daemon.c
index b8254c6..c36e31e 100644
--- a/src/daemon/daemon.c
+++ b/src/daemon/daemon.c
@@ -54,8 +54,6 @@
 #define MAX_NOTIFICATIONS 20
 #define IMAGE_SIZE 48
 #define IDLE_SECONDS 30
-#define NOTIFICATION_BUS_NAME "org.freedesktop.Notifications"
-#define NOTIFICATION_BUS_PATH "/org/freedesktop/Notifications"
 
 #define NW_GET_NOTIFY_ID(nw) \
 (GPOINTER_TO_UINT(g_object_get_data(G_OBJECT(nw), "_notify_id")))
@@ -1534,7 +1532,7 @@ static gboolean notify_daemon_notify_handler(NotifyDaemonNotifications *object,
 /* If the "use-active-monitor" gsettings key is set to TRUE, then
 * get the monitor the pointer is at. Otherwise, get the monitor
 * number the user has set in gsettings. */
- if (g_settings_get_boolean(daemon->gsettings, GSETTINGS_KEY_USE_ACTIVE))
+ if (g_settings_get_boolean(daemon->gsettings, GSETTINGS_KEY_USE_ACTIVE_MONITOR))
 {
 display = gdk_display_get_default ();
 seat = gdk_display_get_default_seat (display);
diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h
index 98f7f4d..06d56e4 100644
--- a/src/daemon/daemon.h
+++ b/src/daemon/daemon.h
@@ -28,13 +28,7 @@
 #include <glib-object.h>
 #include <gio/gio.h>
 
-#define GSETTINGS_SCHEMA "org.mate.NotificationDaemon"
-#define GSETTINGS_KEY_THEME "theme"
-#define GSETTINGS_KEY_POPUP_LOCATION "popup-location"
-#define GSETTINGS_KEY_SOUND_ENABLED "sound-enabled"
-#define GSETTINGS_KEY_DO_NOT_DISTURB "do-not-disturb"
-#define GSETTINGS_KEY_MONITOR_NUMBER "monitor-number"
-#define GSETTINGS_KEY_USE_ACTIVE "use-active-monitor"
+#include "constants.h"
 
 #define NOTIFY_TYPE_DAEMON (notify_daemon_get_type())
 G_DECLARE_FINAL_TYPE (NotifyDaemon, notify_daemon, NOTIFY, DAEMON, GObject)