From ab3f65a15e1b6fe5bdf488e6e879899e283ccc43 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 30 Nov 2012 15:29:34 +0100 Subject: Address couple issues found by a Coverity scan --- calendar/alarm-notify/alarm-notify-dialog.c | 2 +- calendar/alarm-notify/alarm-queue.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'calendar/alarm-notify') diff --git a/calendar/alarm-notify/alarm-notify-dialog.c b/calendar/alarm-notify/alarm-notify-dialog.c index e59080d14e..3bb705a772 100644 --- a/calendar/alarm-notify/alarm-notify-dialog.c +++ b/calendar/alarm-notify/alarm-notify-dialog.c @@ -434,7 +434,7 @@ add_alarm_to_notified_alarms_dialog (AlarmNotificationsDialog *na, AlarmNotifyFunc func, gpointer func_data) { - GtkTreeIter iter; + GtkTreeIter iter = { 0 }; GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (na->treeview)); AlarmFuncInfo *funcinfo = NULL; gchar *to_display = NULL, *start, *end, *str_time; diff --git a/calendar/alarm-notify/alarm-queue.c b/calendar/alarm-notify/alarm-queue.c index e152b59056..18bd49e6e0 100644 --- a/calendar/alarm-notify/alarm-queue.c +++ b/calendar/alarm-notify/alarm-queue.c @@ -1139,7 +1139,8 @@ on_dialog_objs_removed_async (struct _query_msg *msg) if (!id) continue; - if (g_strcmp0 (id->uid, our_id->uid) == 0 && + if (tray_data && + g_strcmp0 (id->uid, our_id->uid) == 0 && g_strcmp0 (id->rid, our_id->rid) == 0) { tray_data->cqa = NULL; tray_data->alarm_id = NULL; -- cgit v1.2.3