Make sure evolution-alarm-notify is running on Evolution's start

2 files changed, 29 insertions, 12 deletions

diff --git a/calendar/alarm-notify/alarm-notify.c b/calendar/alarm-notify/alarm-notify.c
index 3738a7c359..dc588b726c 100644
--- a/calendar/alarm-notify/alarm-notify.c
+++ b/calendar/alarm-notify/alarm-notify.c
@@ -135,19 +135,12 @@ alarm_notify_startup (GApplication *application)
 static void
 alarm_notify_activate (GApplication *application)
 {
-	/* Disregard.  This is just here to prevent the default
-	 * activate method from running, which issues a warning
-	 * if there are no handlers connected to this signal. */
-}
+	AlarmNotify *an = ALARM_NOTIFY (application);
 
-static gboolean
-alarm_notify_initable (GInitable *initable,
-                       GCancellable *cancellable,
-                       GError **error)
-{
-	AlarmNotify *an = ALARM_NOTIFY (initable);
-
-	an->priv->registry = e_source_registry_new_sync (cancellable, error);
+	if (g_application_get_is_remote (application)) {
+		g_application_quit (application);
+		return;
+	}
 
 	if (an->priv->registry != NULL) {
 		alarm_notify_load_calendars (an);
@@ -160,6 +153,16 @@ alarm_notify_initable (GInitable *initable,
 			an->priv->registry, "source-removed",
 			G_CALLBACK (alarm_notify_remove_calendar), an);
 	}
+}
+
+static gboolean
+alarm_notify_initable (GInitable *initable,
+                       GCancellable *cancellable,
+                       GError **error)
+{
+	AlarmNotify *an = ALARM_NOTIFY (initable);
+
+	an->priv->registry = e_source_registry_new_sync (cancellable, error);
 
 	return (an->priv->registry != NULL);
 }
diff --git a/calendar/alarm-notify/notify-main.c b/calendar/alarm-notify/notify-main.c
index 2b04104417..c112331a3d 100644
--- a/calendar/alarm-notify/notify-main.c
+++ b/calendar/alarm-notify/notify-main.c
@@ -99,6 +99,20 @@ main (gint argc,
 		exit (EXIT_FAILURE);
 	}
 
+	g_application_register (G_APPLICATION (alarm_notify_service), NULL, &error);
+
+	if (error != NULL) {
+		g_printerr ("%s\n", error->message);
+		g_error_free (error);
+		g_object_unref (alarm_notify_service);
+		exit (EXIT_FAILURE);
+	}
+
+	if (g_application_get_is_remote (G_APPLICATION (alarm_notify_service))) {
+		g_object_unref (alarm_notify_service);
+		return 0;
+	}
+
 	exit_status = g_application_run (
 		G_APPLICATION (alarm_notify_service), argc, argv);