4 files changed, 7 insertions, 3 deletions
diff --git a/calendar/gui/dialogs/alarm-dialog.c b/calendar/gui/dialogs/alarm-dialog.c
index 7755cc3b17..34d5a8e3a2 100644
--- a/calendar/gui/dialogs/alarm-dialog.c
+++ b/calendar/gui/dialogs/alarm-dialog.c
@@ -624,6 +624,8 @@ populate_widgets_from_alarm (Dialog *dialog)
 	case E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END:	
 		e_dialog_option_menu_set (dialog->time, E_CAL_COMPONENT_ALARM_TRIGGER_RELATIVE_END, time_map);
 		break;
+        default:
+                g_warning ("%s: Unexpected alarm type (%d)", G_STRLOC, trigger->type);
 	}
 
 	switch ( trigger->u.rel_duration.is_neg ){
@@ -674,6 +676,8 @@ populate_widgets_from_alarm (Dialog *dialog)
 	case E_CAL_COMPONENT_ALARM_PROCEDURE:
 		alarm_to_palarm_widgets (dialog, dialog->alarm);
 		break;
+        default:
+                g_warning ("%s: Unexpected alarm action (%d)", G_STRLOC, *action);
 	}
 }
 
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 9562675f6a..f43640c264 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -3147,7 +3147,7 @@ event_page_select_organizer (EventPage *epage, const char *backend_address)
 	EventPagePrivate *priv;
 	GList *l;
 	EAccount *def_account;
-	const char *def_address = NULL;
+	gchar *def_address = NULL;
 	gboolean subscribed_cal = FALSE;
 	ESource *source = NULL;
 	const char *user_addr = NULL;
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index ac94a0ccf8..fb6ce991d1 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -1112,7 +1112,7 @@ memo_page_select_organizer (MemoPage *mpage, const char *backend_address)
 	MemoPagePrivate *priv;
 	GList *l;
 	EAccount *def_account;
-	const char *def_address;
+	gchar *def_address;
 	gboolean subscribed_cal = FALSE;
 	ESource *source = NULL;
 	const char *user_addr = NULL;
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index 33a32bbd54..5a6d685524 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1913,7 +1913,7 @@ task_page_select_organizer (TaskPage *tpage, const char *backend_address)
 	TaskPagePrivate *priv;
 	GList *l;
 	EAccount *def_account;
-	const char *def_address = NULL;
+	gchar *def_address = NULL;
 	gboolean subscribed_cal = FALSE;
 	ESource *source = NULL;
 	const char *user_addr = NULL;