Embedded daemon in one unified binary

core/Services/Calendar/EventStore.vala

@@ -74,7 +74,7 @@ public class Calendar.EventStore : Object {
         }
     }
 
-    protected EventStore () {
+    public EventStore () {
         this.week_starts_on = get_week_start ();
         this.month_start = Calendar.Util.datetime_get_start_of_month (get_page ());
         compute_ranges ();
@@ -368,7 +368,7 @@ public class Calendar.EventStore : Object {
         int wso = (int) week_starts_on;
         int offset = 0;
 
-        // offset corresponds number of days from the start of the week to 
+        // offset corresponds number of days from the start of the week to
         // month_start, as seen on a displayed calendar.
         if (wso < dow) {
             offset = dow - wso;

data/io.elementary.calendar-daemon.desktop.in

@@ -2,7 +2,7 @@
 Name=Calendar Daemon
 Comment=View Event Reminders
 Icon=io.elementary.calendar
-Exec=@EXEC_PATH@
+Exec=@EXEC_PATH@ --background
 Terminal=false
 Type=Application
 Categories=System;

meson.build

@@ -58,7 +58,6 @@ gresource_calendar = gnome.compile_resources(
 
 subdir('data')
 subdir('core')
-subdir('daemon')
 subdir('src')
 subdir('plugins')
 subdir('po')

src/Application.vala

@@ -29,6 +29,7 @@ namespace Maya {
         public MainWindow window;
         public static GLib.Settings? saved_state = null;
         public static GLib.Settings? wingpanel_settings = null;
+        public static bool run_in_background = false;
 
         static construct {
             if (SettingsSchemaSource.get_default ().lookup ("io.elementary.calendar.savedstate", true) != null) {
@@ -58,10 +59,18 @@ namespace Maya {
         public const OptionEntry[] APP_OPTIONS = {
             { "add-event", 'a', 0, OptionArg.NONE, out Option.add_event, N_("Create an event"), null },
             { "show-day", 's', 0, OptionArg.STRING, out Option.show_day, N_("Focus the given day"), N_("date") },
+            { "background", 'b', 0, OptionArg.NONE, out run_in_background, "Run the Application in background", null},
             { null }
         };
 
         protected override void activate () {
+            if (run_in_background) {
+                run_in_background = false;
+                new Calendar.TodayEventMonitor ();
+                hold ();
+                return;
+            }
+
             if (get_windows () != null) {
                 get_windows ().data.present (); // present window if app is already running
                 return;