From b168fcbe1b705ba710d1e7b1b3e4feeb32c13276 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 23 Feb 2010 11:28:19 +0100 Subject: Do less output on an evolution-alarm-notify console --- calendar/gui/alarm-notify/alarm-notify-dialog.c | 2 +- calendar/gui/alarm-notify/alarm-queue.c | 3 +-- calendar/gui/alarm-notify/alarm.c | 14 ++++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) (limited to 'calendar/gui/alarm-notify') diff --git a/calendar/gui/alarm-notify/alarm-notify-dialog.c b/calendar/gui/alarm-notify/alarm-notify-dialog.c index 59cf6c729f..7062ccb376 100644 --- a/calendar/gui/alarm-notify/alarm-notify-dialog.c +++ b/calendar/gui/alarm-notify/alarm-notify-dialog.c @@ -272,7 +272,7 @@ notified_alarms_dialog_new (void) if (!(an->dialog && an->scrolledwindow && an->treeview && an->snooze_time_min && an->snooze_time_hrs && an->description && an->location && edit_btn && snooze_btn && an->dismiss_btn)) { - g_message ("alarm_notify_dialog(): Could not find all widgets in Glade file!"); + g_warning ("alarm_notify_dialog(): Could not find all widgets in alarm-notify.ui file!"); g_object_unref (an->builder); g_free (an); return NULL; diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c index d8ccda8d72..9662c6231e 100644 --- a/calendar/gui/alarm-notify/alarm-queue.c +++ b/calendar/gui/alarm-notify/alarm-queue.c @@ -492,7 +492,6 @@ add_component_alarms (ClientAlarms *ca, ECalComponentAlarms *alarms) e_cal_component_alarms_free (cqa->alarms); cqa->alarms = NULL; d(printf("%s:%d (add_component_alarms) - Failed to add all : %p\n",__FILE__, __LINE__, cqa)); - g_message ("Failed to add all\n"); g_free (cqa); return; } @@ -1629,7 +1628,7 @@ audio_notification (time_t trigger, CompQueuedAlarms *cqa, filename = g_filename_from_uri (url, NULL, &error); if (error != NULL) { - g_warning ("%s", error->message); + g_warning ("%s: %s", G_STRFUNC, error->message); g_error_free (error); } else if (g_file_test (filename, G_FILE_TEST_EXISTS)) { flag = 1; diff --git a/calendar/gui/alarm-notify/alarm.c b/calendar/gui/alarm-notify/alarm.c index 9b37501ffc..14f66a68fb 100644 --- a/calendar/gui/alarm-notify/alarm.c +++ b/calendar/gui/alarm-notify/alarm.c @@ -32,6 +32,8 @@ #include #include "alarm.h" +#define d(x) + /* Our glib timeout */ @@ -87,7 +89,7 @@ alarm_ready_cb (gpointer data) now = time (NULL); - g_message ("Alarm callback!"); + d(g_message ("Alarm callback!")); while (alarms) { AlarmRecord *notify_id, *ar; AlarmRecord ar_copy; @@ -97,7 +99,7 @@ alarm_ready_cb (gpointer data) if (ar->trigger > now) break; - g_message ("Process alarm with trigger %lu", ar->trigger); + d(g_message ("Process alarm with trigger %lu", ar->trigger)); notify_id = ar; ar_copy = *ar; @@ -150,9 +152,9 @@ setup_timeout (void) now = time (NULL); /* Add the time out */ - g_message ("Setting timeout for %d %lu %lu", diff, ar->trigger, now); - g_message (" %s", ctime (&ar->trigger)); - g_message (" %s", ctime (&now)); + d(g_message ("Setting timeout for %d %lu %lu", diff, ar->trigger, now)); + d(g_message (" %s", ctime (&ar->trigger))); + d(g_message (" %s", ctime (&now))); timeout_id = g_timeout_add_seconds (diff, alarm_ready_cb, NULL); } @@ -247,7 +249,7 @@ alarm_remove (gpointer alarm) l = g_list_find (alarms, ar); if (!l) { - g_message (G_STRLOC ": Requested removal of nonexistent alarm!"); + g_warning (G_STRLOC ": Requested removal of nonexistent alarm!"); return; } -- cgit v1.2.3