aboutsummaryrefslogtreecommitdiff
path: root/src/main.c
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2013-10-24 04:15:20 +0000
committerTarmac <Unknown>2013-10-24 04:15:20 +0000
commit9e2f24172c1fa388e2be2938998b20f5bf3a8241 (patch)
tree3cf94298d909590579d5171a7bc95b5a0608efd3 /src/main.c
parente38b6293bb37557d27efd052c82ee44d70996077 (diff)
parent6da162acd4a293a1cfe1933c54f6b06935deebbf (diff)
downloadayatana-indicator-datetime-9e2f24172c1fa388e2be2938998b20f5bf3a8241.tar.gz
ayatana-indicator-datetime-9e2f24172c1fa388e2be2938998b20f5bf3a8241.tar.bz2
ayatana-indicator-datetime-9e2f24172c1fa388e2be2938998b20f5bf3a8241.zip
Make timezone detection and localtime mockable. Fixes: https://bugs.launchpad.net/bugs/1237509.
Approved by PS Jenkins bot, Ted Gould.
Diffstat (limited to 'src/main.c')
-rw-r--r--src/main.c43
1 files changed, 9 insertions, 34 deletions
diff --git a/src/main.c b/src/main.c
index f791683..dc08419 100644
--- a/src/main.c
+++ b/src/main.c
@@ -26,36 +26,26 @@
#include <gio/gio.h>
#include <libnotify/notify.h>
+#include "clock-live.h"
#include "planner-eds.h"
-#include "planner-mock.h"
#include "service.h"
/***
****
***/
-/* When enabled, new alarms will show up every minute to test snap decisions */
-static gboolean test_alarms = FALSE;
-
-static GOptionEntry entries[] = {
- { "test-alarms", '\0', 0, G_OPTION_ARG_NONE, &test_alarms, "Test Alarms", NULL },
- { NULL }
-};
-
static void
on_name_lost (gpointer instance G_GNUC_UNUSED, gpointer loop)
{
g_message ("exiting: service couldn't acquire or lost ownership of busname");
- if (!test_alarms)
- g_main_loop_quit ((GMainLoop*)loop);
+ g_main_loop_quit ((GMainLoop*)loop);
}
int
main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
{
- GOptionContext * context;
- GError * error;
+ IndicatorDatetimeClock * clock;
IndicatorDatetimePlanner * planner;
IndicatorDatetimeService * service;
GMainLoop * loop;
@@ -69,36 +59,21 @@ main (int argc G_GNUC_UNUSED, char ** argv G_GNUC_UNUSED)
if (!notify_init ("indicator-datetime-service"))
g_critical ("libnotify initialization failed");
- /* parse command-line options */
- 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))
- {
- g_print("option parsing failed: %s\n", error->message);
- return EXIT_FAILURE;
- }
-
- /* set up the planner */
- if (test_alarms)
- {
- g_message ("Using fake appointment book for testing alarms.");
- planner = indicator_datetime_planner_mock_new ();
- }
- else
- {
- planner = indicator_datetime_planner_eds_new ();
- }
+ /* create the service */
+ clock = indicator_datetime_clock_live_new ();
+ planner = indicator_datetime_planner_eds_new ();
+ service = indicator_datetime_service_new (clock, planner);
/* run */
- service = indicator_datetime_service_new (planner);
loop = g_main_loop_new (NULL, FALSE);
g_signal_connect (service, INDICATOR_DATETIME_SERVICE_SIGNAL_NAME_LOST,
G_CALLBACK(on_name_lost), loop);
g_main_loop_run (loop);
+ g_main_loop_unref (loop);
/* cleanup */
- g_main_loop_unref (loop);
g_object_unref (service);
g_object_unref (planner);
+ g_object_unref (clock);
return 0;
}