Fix compiler warnings in calendar.

41 files changed, 297 insertions, 292 deletions

diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c
index e7be5554b8..887cf7f249 100644
--- a/calendar/gui/alarm-notify/alarm-queue.c
+++ b/calendar/gui/alarm-notify/alarm-queue.c
@@ -150,7 +150,6 @@ static void popup_notification (time_t trigger, CompQueuedAlarms *cqa,
 static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data);
 static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data);
 
-static void remove_client_alarms (ClientAlarms *ca);
 static void update_cqa (CompQueuedAlarms *cqa, ECalComponent *comp);
 static void update_qa (ECalComponentAlarms *alarms, QueuedAlarm *qa);
 static void tray_list_remove_cqa (CompQueuedAlarms *cqa);
@@ -921,8 +920,8 @@ edit_component (ECal *client, ECalComponent *comp)
 
 	/* Get the factory */
 	CORBA_exception_init (&ev);
-	factory = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION,
-						      0, NULL, &ev);
+	factory = bonobo_activation_activate_from_id (
+		(Bonobo_ActivationID) "OAFIID:GNOME_Evolution_Calendar_CompEditorFactory:" BASE_VERSION, 0, NULL, &ev);
 
 	if (BONOBO_EX (&ev)) {
 		e_error_run (NULL, "editor-error", bonobo_exception_get_text (&ev), NULL);
diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 9ea91f8350..aab5d98d30 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -72,12 +72,12 @@ enum {
 
 /* Comments are disabled because they are kind of useless right now, see bug 33247 */
 static ESearchBarItem search_option_items[] = {
-	{ N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, ESB_ITEMTYPE_RADIO },
-	{ N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, ESB_ITEMTYPE_RADIO },
-	{ N_("Category is"), SEARCH_CATEGORY_IS, ESB_ITEMTYPE_RADIO },
-	{ N_("Comment contains"), SEARCH_COMMENT_CONTAINS, ESB_ITEMTYPE_RADIO },
-	{ N_("Location contains"), SEARCH_LOCATION_CONTAINS, ESB_ITEMTYPE_RADIO },
-	{ N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, ESB_ITEMTYPE_RADIO },
+	{ (gchar *) N_("Summary contains"), SEARCH_SUMMARY_CONTAINS, ESB_ITEMTYPE_RADIO },
+	{ (gchar *) N_("Description contains"), SEARCH_DESCRIPTION_CONTAINS, ESB_ITEMTYPE_RADIO },
+	{ (gchar *) N_("Category is"), SEARCH_CATEGORY_IS, ESB_ITEMTYPE_RADIO },
+	{ (gchar *) N_("Comment contains"), SEARCH_COMMENT_CONTAINS, ESB_ITEMTYPE_RADIO },
+	{ (gchar *) N_("Location contains"), SEARCH_LOCATION_CONTAINS, ESB_ITEMTYPE_RADIO },
+	{ (gchar *) N_("Any field contains"), SEARCH_ANY_FIELD_CONTAINS, ESB_ITEMTYPE_RADIO },
 };
 
 /* IDs for the categories suboptions */
@@ -408,7 +408,7 @@ static void
 notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const char *view)
 {
 	char *text = NULL;
-	char *sexp = " ";
+	char *sexp;
 
 	text = e_search_bar_get_text (E_SEARCH_BAR (cal_search));
 
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index c0c60dbbf9..94a35f3e65 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -345,7 +345,7 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
 }
 
 struct _sensitize_item {
-	char *command;
+	const gchar *command;
 	guint32 enable;
 };
 
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 078c854b98..53abc5632a 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -78,8 +78,8 @@ enum DndTargetType {
 #define CALENDAR_TYPE "text/calendar"
 #define XCALENDAR_TYPE "text/x-calendar"
 static GtkTargetEntry drag_types[] = {
-	{ CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST },
-	{ XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }
+	{ (gchar *) CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST },
+	{ (gchar *) XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }
 };
 static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
 #define CALENDAR_COMPONENT_DEFAULT(cc) if (cc == NULL) cc = calendar_component_peek()
@@ -460,8 +460,9 @@ update_task_memo_selection (CalendarComponentView *component_view, ECalSourceTyp
 		ESource *source;
 
 		source = e_source_list_peek_source_by_uid (source_list, uid);
-		if (source && !gnome_calendar_add_source (component_view->calendar, type, source))
+		if (source && !gnome_calendar_add_source (component_view->calendar, type, source)) {
 			/* FIXME do something */;
+		}
 	}
 
 	if (type == E_CAL_SOURCE_TYPE_TODO)
@@ -623,17 +624,17 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem ecc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "x-office-calendar", 0, 0 },
-	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_calendar_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Calendar"), new_calendar_cb, NULL, (gchar *) "x-office-calendar", 0, 0 },
+	{ E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_calendar_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_calendar_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
-	{ E_POPUP_BAR, "20.bar" },
-	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE },
-	{ E_POPUP_ITEM, "30.mark_calendar_offline", N_("_Make available for offline use"), mark_offline_cb, NULL, "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
-	{ E_POPUP_ITEM, "40.mark_calendar_no_offline", N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
+	{ E_POPUP_BAR, (gchar *) "20.bar" },
+	{ E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_calendar_cb, NULL, (gchar *) "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE },
+	{ E_POPUP_ITEM, (gchar *) "30.mark_calendar_offline", (gchar *) N_("_Make available for offline use"), mark_offline_cb, NULL, (gchar *) "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
+	{ E_POPUP_ITEM, (gchar *) "40.mark_calendar_no_offline", (gchar *) N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, (gchar *) "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
 
-	{ E_POPUP_BAR, "99.bar" },
-	{ E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_calendar_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_BAR, (gchar *) "99.bar" },
+	{ E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_calendar_cb, NULL, (gchar *) "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -1433,36 +1434,36 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	CORBA_sequence_set_release (list, FALSE);
 
-	list->_buffer[0].id = CREATE_EVENT_ID;
-	list->_buffer[0].description = _("New appointment");
+	list->_buffer[0].id = (char *) CREATE_EVENT_ID;
+	list->_buffer[0].description = (char *) _("New appointment");
 	list->_buffer[0].menuDescription = (char *) C_("New", "_Appointment");
-	list->_buffer[0].tooltip = _("Create a new appointment");
+	list->_buffer[0].tooltip = (char *) _("Create a new appointment");
 	list->_buffer[0].menuShortcut = 'a';
-	list->_buffer[0].iconName = "appointment-new";
+	list->_buffer[0].iconName = (char *) "appointment-new";
 	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[1].id = CREATE_MEETING_ID;
-	list->_buffer[1].description = _("New meeting");
+	list->_buffer[1].id = (char *) CREATE_MEETING_ID;
+	list->_buffer[1].description = (char *) _("New meeting");
 	list->_buffer[1].menuDescription = (char *) C_("New", "M_eeting");
-	list->_buffer[1].tooltip = _("Create a new meeting request");
+	list->_buffer[1].tooltip = (char *) _("Create a new meeting request");
 	list->_buffer[1].menuShortcut = 'e';
-	list->_buffer[1].iconName = "stock_new-meeting";
+	list->_buffer[1].iconName = (char *) "stock_new-meeting";
 	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[2].id = CREATE_ALLDAY_EVENT_ID;
-	list->_buffer[2].description = _("New all day appointment");
+	list->_buffer[2].id = (char *) CREATE_ALLDAY_EVENT_ID;
+	list->_buffer[2].description = (char *) _("New all day appointment");
 	list->_buffer[2].menuDescription = (char *) C_("New", "All Day A_ppointment");
-	list->_buffer[2].tooltip = _("Create a new all-day appointment");
+	list->_buffer[2].tooltip = (char *) _("Create a new all-day appointment");
 	list->_buffer[2].menuShortcut = '\0';
-	list->_buffer[2].iconName = "stock_new-24h-appointment";
+	list->_buffer[2].iconName = (char *) "stock_new-24h-appointment";
 	list->_buffer[2].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[3].id = CREATE_CALENDAR_ID;
-	list->_buffer[3].description = _("New calendar");
+	list->_buffer[3].id = (char *) CREATE_CALENDAR_ID;
+	list->_buffer[3].description = (char *) _("New calendar");
 	list->_buffer[3].menuDescription = (char *) C_("New", "Cale_ndar");
-	list->_buffer[3].tooltip = _("Create a new calendar");
+	list->_buffer[3].tooltip = (char *) _("Create a new calendar");
 	list->_buffer[3].menuShortcut = '\0';
-	list->_buffer[3].iconName = "x-office-calendar";
+	list->_buffer[3].iconName = (char *) "x-office-calendar";
 	list->_buffer[3].type = GNOME_Evolution_CREATABLE_FOLDER;
 
 	return list;
@@ -1609,10 +1610,8 @@ calendar_component_init (CalendarComponent *component)
 	component->priv = priv;
 	ensure_sources (component);
 
-	if (!e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL))
-		;
-	if (!e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL))
-		;
+	e_cal_get_sources (&priv->task_source_list, E_CAL_SOURCE_TYPE_TODO, NULL);
+	e_cal_get_sources (&priv->memo_source_list, E_CAL_SOURCE_TYPE_JOURNAL, NULL);
 }
 
 
diff --git a/calendar/gui/dialogs/cal-prefs-dialog.c b/calendar/gui/dialogs/cal-prefs-dialog.c
index 0e1f0f05d1..b2763ca479 100644
--- a/calendar/gui/dialogs/cal-prefs-dialog.c
+++ b/calendar/gui/dialogs/cal-prefs-dialog.c
@@ -739,17 +739,17 @@ show_config (CalendarPrefsDialog *prefs)
 
 /* plugin meta-data */
 static ECalConfigItem eccp_items[] = {
-	{ E_CONFIG_BOOK,          "",                             "toplevel-notebook",   eccp_widget_glade },
-	{ E_CONFIG_PAGE,          "00.general",                   "general",             eccp_widget_glade },
-	{ E_CONFIG_SECTION_TABLE, "00.general/00.time",           "time",                eccp_widget_glade },
-	{ E_CONFIG_SECTION_TABLE, "00.general/10.workWeek",       "workWeek",            eccp_widget_glade },
-	{ E_CONFIG_SECTION,       "00.general/20.alerts",         "alerts",              eccp_widget_glade },
-	{ E_CONFIG_PAGE,          "10.display",                   "display",             eccp_widget_glade },
-	{ E_CONFIG_SECTION,       "10.display/00.general",        "displayGeneral",      eccp_widget_glade },
-	{ E_CONFIG_SECTION,       "10.display/10.taskList",       "taskList",            eccp_widget_glade },
-	{ E_CONFIG_PAGE,	  "15.alarms",			  "alarms",		 eccp_widget_glade },
-	{ E_CONFIG_PAGE,          "20.freeBusy",                  "freebusy",            eccp_widget_glade },
-	{ E_CONFIG_SECTION,       "20.freeBusy/00.defaultServer", "defaultFBServer",     eccp_widget_glade },
+	{ E_CONFIG_BOOK,          (gchar *) "",                             (gchar *) "toplevel-notebook", eccp_widget_glade },
+	{ E_CONFIG_PAGE,          (gchar *) "00.general",                   (gchar *) "general",           eccp_widget_glade },
+	{ E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.time",           (gchar *) "time",              eccp_widget_glade },
+	{ E_CONFIG_SECTION_TABLE, (gchar *) "00.general/10.workWeek",       (gchar *) "workWeek",          eccp_widget_glade },
+	{ E_CONFIG_SECTION,       (gchar *) "00.general/20.alerts",         (gchar *) "alerts",            eccp_widget_glade },
+	{ E_CONFIG_PAGE,          (gchar *) "10.display",                   (gchar *) "display",           eccp_widget_glade },
+	{ E_CONFIG_SECTION,       (gchar *) "10.display/00.general",        (gchar *) "displayGeneral",    eccp_widget_glade },
+	{ E_CONFIG_SECTION,       (gchar *) "10.display/10.taskList",       (gchar *) "taskList",          eccp_widget_glade },
+	{ E_CONFIG_PAGE,          (gchar *) "15.alarms",                    (gchar *) "alarms",            eccp_widget_glade },
+	{ E_CONFIG_PAGE,          (gchar *) "20.freeBusy",                  (gchar *) "freebusy",          eccp_widget_glade },
+	{ E_CONFIG_SECTION,       (gchar *) "20.freeBusy/00.defaultServer", (gchar *) "defaultFBServer",   eccp_widget_glade },
 };
 
 static void
diff --git a/calendar/gui/dialogs/calendar-setup.c b/calendar/gui/dialogs/calendar-setup.c
index b182f9cc78..3ee589406b 100644
--- a/calendar/gui/dialogs/calendar-setup.c
+++ b/calendar/gui/dialogs/calendar-setup.c
@@ -363,35 +363,35 @@ eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent
 }
 
 static ECalConfigItem eccp_items[] = {
-	{ E_CONFIG_BOOK, "", NULL },
-	{ E_CONFIG_PAGE,          "00.general", N_("General") },
-	{ E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Calendar") },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/00.type", NULL, eccp_get_source_type },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/10.name", NULL, eccp_get_source_name },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/20.color", NULL, eccp_get_source_color },
-	{ E_CONFIG_ITEM_TABLE,	  "00.general/00.source/30.offline", NULL, eccp_general_offline },
+	{ E_CONFIG_BOOK,          (gchar *) "", NULL },
+	{ E_CONFIG_PAGE,          (gchar *) "00.general", (gchar *) N_("General") },
+	{ E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Calendar") },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color },
+	{ E_CONFIG_ITEM_TABLE,	  (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline },
 	{ 0 },
 };
 
 static ECalConfigItem ectp_items[] = {
-	{ E_CONFIG_BOOK, "", NULL },
-	{ E_CONFIG_PAGE,          "00.general", N_("General") },
-	{ E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Task List") },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/00.type", NULL, eccp_get_source_type },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/10.name", NULL, eccp_get_source_name },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/20.color", NULL, eccp_get_source_color },
-	{ E_CONFIG_ITEM_TABLE,	  "00.general/00.source/30.offline", NULL, eccp_general_offline },
+	{ E_CONFIG_BOOK,          (gchar *) "", NULL },
+	{ E_CONFIG_PAGE,          (gchar *) "00.general", (gchar *) N_("General") },
+	{ E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Task List") },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color },
+	{ E_CONFIG_ITEM_TABLE,	  (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline },
 	{ 0 },
 };
 
 static ECalConfigItem ecmp_items[] = {
-	{ E_CONFIG_BOOK, "", NULL },
-	{ E_CONFIG_PAGE,          "00.general", N_("General") },
-	{ E_CONFIG_SECTION_TABLE, "00.general/00.source", N_("Memo List") },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/00.type", NULL, eccp_get_source_type },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/10.name", NULL, eccp_get_source_name },
-	{ E_CONFIG_ITEM_TABLE,    "00.general/00.source/20.color", NULL, eccp_get_source_color },
-	{ E_CONFIG_ITEM_TABLE,	  "00.general/00.source/30.offline", NULL, eccp_general_offline },
+	{ E_CONFIG_BOOK,          (gchar *) "", NULL },
+	{ E_CONFIG_PAGE,          (gchar *) "00.general", (gchar *) N_("General") },
+	{ E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.source", (gchar *) N_("Memo List") },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/00.type", NULL, eccp_get_source_type },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/10.name", NULL, eccp_get_source_name },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/20.color", NULL, eccp_get_source_color },
+	{ E_CONFIG_ITEM_TABLE,    (gchar *) "00.general/00.source/30.offline", NULL, eccp_general_offline },
 	{ 0 },
 };
 
diff --git a/calendar/gui/dialogs/comp-editor-util.c b/calendar/gui/dialogs/comp-editor-util.c
index 6547731776..f09024eba0 100644
--- a/calendar/gui/dialogs/comp-editor-util.c
+++ b/calendar/gui/dialogs/comp-editor-util.c
@@ -112,8 +112,12 @@ comp_editor_free_dates (CompEditorPageDates *dates)
 
 /* dtstart is only passed in if tt is the dtend. */
 static void
-write_label_piece (struct icaltimetype *tt, char *buffer, int size,
-		   char *stext, char *etext, struct icaltimetype *dtstart)
+write_label_piece (struct icaltimetype *tt,
+                   gchar *buffer,
+                   gint size,
+                   gchar *stext,
+                   const gchar *etext,
+                   struct icaltimetype *dtstart)
 {
 	struct tm tmp_tm = { 0 };
 	struct icaltimetype tt_copy = *tt;
diff --git a/calendar/gui/dialogs/e-send-options-utils.c b/calendar/gui/dialogs/e-send-options-utils.c
index 52f73aed02..d9a55ac47a 100644
--- a/calendar/gui/dialogs/e-send-options-utils.c
+++ b/calendar/gui/dialogs/e-send-options-utils.c
@@ -28,7 +28,7 @@
 #include <string.h>
 
 void
-e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char * type)
+e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type)
 {
 	ESendOptionsGeneral *gopts = NULL;
 	ESendOptionsStatusTracking *sopts;
diff --git a/calendar/gui/dialogs/e-send-options-utils.h b/calendar/gui/dialogs/e-send-options-utils.h
index cae3131c00..568ef5be3b 100644
--- a/calendar/gui/dialogs/e-send-options-utils.h
+++ b/calendar/gui/dialogs/e-send-options-utils.h
@@ -29,6 +29,6 @@
 #include <libecal/e-cal-component.h>
 #include <libedataserver/e-source-list.h>
 
-void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, char* type);
+void e_sendoptions_utils_set_default_data (ESendOptionsDialog *sod, ESource *source, const gchar *type);
 void e_sendoptions_utils_fill_component (ESendOptionsDialog *sod, ECalComponent *comp);
 #endif
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index cd54c65c08..b225cdd6bd 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -1584,20 +1584,20 @@ void update_end_time_combo (EventPage *epage)
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (priv->minute_selector), minutes);
 }
 
-void
-static hour_sel_changed (GtkSpinButton *widget, EventPage *epage)
+static void
+hour_sel_changed (GtkSpinButton *widget, EventPage *epage)
 {
 	hour_minute_changed (epage);
 }
 
-void
-static minute_sel_changed (GtkSpinButton *widget, EventPage *epage)
+static void
+minute_sel_changed (GtkSpinButton *widget, EventPage *epage)
 {
 	hour_minute_changed (epage);
 }
 
-void
-static hour_minute_changed ( EventPage *epage)
+static void
+hour_minute_changed (EventPage *epage)
 {
 	EventPagePrivate *priv;
 	gint for_hours, for_minutes;
@@ -1889,8 +1889,8 @@ enum {
 };
 
 static EPopupItem context_menu_items[] = {
-	{ E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
-	{ E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD },
+	{ E_POPUP_ITEM, (gchar *) "10.delete", (gchar *) N_("_Remove"), popup_delete_cb, NULL, (gchar *) GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
+	{ E_POPUP_ITEM, (gchar *) "15.add", (gchar *) N_("_Add "), popup_add_cb, NULL, (gchar *) GTK_STOCK_ADD, ATTENDEE_CAN_ADD },
 };
 
 static void
diff --git a/calendar/gui/dialogs/task-page.c b/calendar/gui/dialogs/task-page.c
index fc0c2330bf..f371e60cdb 100644
--- a/calendar/gui/dialogs/task-page.c
+++ b/calendar/gui/dialogs/task-page.c
@@ -1199,8 +1199,8 @@ enum {
 };
 
 static EPopupItem context_menu_items[] = {
-	{ E_POPUP_ITEM, "10.delete", N_("_Remove"), popup_delete_cb, NULL, GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
-	{ E_POPUP_ITEM, "15.add", N_("_Add "), popup_add_cb, NULL, GTK_STOCK_ADD, ATTENDEE_CAN_ADD },
+	{ E_POPUP_ITEM, (gchar *) "10.delete", (gchar *) N_("_Remove"), popup_delete_cb, NULL, (gchar *) GTK_STOCK_REMOVE, ATTENDEE_CAN_DELETE },
+	{ E_POPUP_ITEM, (gchar *) "15.add", (gchar *) N_("_Add "), popup_add_cb, NULL, (gchar *) GTK_STOCK_ADD, ATTENDEE_CAN_ADD },
 };
 
 static void
diff --git a/calendar/gui/e-cal-model-calendar.c b/calendar/gui/e-cal-model-calendar.c
index 7f5d7b55c6..db25bf23de 100644
--- a/calendar/gui/e-cal-model-calendar.c
+++ b/calendar/gui/e-cal-model-calendar.c
@@ -169,7 +169,7 @@ get_location (ECalModelComponent *comp_data)
 	if (prop)
 		return (void *) icalproperty_get_location (prop);
 
-	return "";
+	return (void *) "";
 }
 
 static void *
@@ -209,7 +209,7 @@ ecmc_value_at (ETableModel *etm, int col, int row)
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 	if (!comp_data)
-		return "";
+		return (void *) "";
 
 	switch (col) {
 	case E_CAL_MODEL_CALENDAR_FIELD_DTEND :
@@ -220,7 +220,7 @@ ecmc_value_at (ETableModel *etm, int col, int row)
 		return get_transparency (comp_data);
 	}
 
-	return "";
+	return (void *) "";
 }
 
 static void
diff --git a/calendar/gui/e-cal-model-memos.c b/calendar/gui/e-cal-model-memos.c
index ffb1c8a488..0984827702 100644
--- a/calendar/gui/e-cal-model-memos.c
+++ b/calendar/gui/e-cal-model-memos.c
@@ -130,9 +130,9 @@ ecmm_value_at (ETableModel *etm, int col, int row)
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 	if (!comp_data)
-		return "";
+		return (void *) "";
 
-	return "";
+	return (void *) "";
 }
 
 
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 095cfabc4b..5827117f14 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -289,7 +289,7 @@ get_due (ECalModelComponent *comp_data)
 	return comp_data->due;
 }
 
-static char *
+static void *
 get_geo (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -307,7 +307,7 @@ get_geo (ECalModelComponent *comp_data)
 		return buf;
 	}
 
-	return "";
+	return (void *) "";
 }
 
 static int
@@ -322,7 +322,7 @@ get_percent (ECalModelComponent *comp_data)
 	return 0;
 }
 
-static char *
+static void *
 get_priority (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -331,7 +331,7 @@ get_priority (ECalModelComponent *comp_data)
 	if (prop)
 		return e_cal_util_priority_to_string (icalproperty_get_priority (prop));
 
-	return "";
+	return (void *) "";
 }
 
 static gboolean
@@ -344,7 +344,7 @@ is_status_canceled (ECalModelComponent *comp_data)
 	return prop && icalproperty_get_status (prop) == ICAL_STATUS_CANCELLED;
 }
 
-static char *
+static void *
 get_status (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -353,33 +353,33 @@ get_status (ECalModelComponent *comp_data)
 	if (prop) {
 		switch (icalproperty_get_status (prop)) {
 		case ICAL_STATUS_NONE:
-			return "";
+			return (void *) "";
 		case ICAL_STATUS_NEEDSACTION:
-			return _("Not Started");
+			return (void *) _("Not Started");
 		case ICAL_STATUS_INPROCESS:
-			return _("In Progress");
+			return (void *) _("In Progress");
 		case ICAL_STATUS_COMPLETED:
-			return _("Completed");
+			return (void *) _("Completed");
 		case ICAL_STATUS_CANCELLED:
-			return _("Canceled");
+			return (void *) _("Canceled");
 		default:
-			return "";
+			return (void *) "";
 		}
 	}
 
-	return "";
+	return (void *) "";
 }
 
-static char *
+static void *
 get_url (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_URL_PROPERTY);
 	if (prop)
-		return (char *) icalproperty_get_url (prop);
+		return (void *) icalproperty_get_url (prop);
 
-	return "";
+	return (void *) "";
 }
 
 static gboolean
@@ -499,7 +499,7 @@ ecmt_value_at (ETableModel *etm, int col, int row)
 
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), row);
 	if (!comp_data)
-		return "";
+		return (void *) "";
 
 	switch (col) {
 	case E_CAL_MODEL_TASKS_FIELD_COMPLETED :
@@ -524,7 +524,7 @@ ecmt_value_at (ETableModel *etm, int col, int row)
 		return get_url (comp_data);
 	}
 
-	return "";
+	return (void *) "";
 }
 
 static void
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 20306b7128..736f6a8b56 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -317,16 +317,16 @@ ecm_row_count (ETableModel *etm)
 	return priv->objects->len;
 }
 
-static char *
+static void *
 get_categories (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_CATEGORIES_PROPERTY);
 	if (prop)
-		return (char *) icalproperty_get_categories (prop);
+		return (void *) icalproperty_get_categories (prop);
 
-	return "";
+	return (void *) "";
 }
 
 static char *
@@ -363,7 +363,7 @@ get_color (ECalModel *model, ECalModelComponent *comp_data)
 	return e_cal_model_get_color_for_component (model, comp_data);
 }
 
-static char *
+static void *
 get_description (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
@@ -384,7 +384,7 @@ get_description (ECalModelComponent *comp_data)
 		return str->str;
 	}
 
-	return "";
+	return (void *) "";
 }
 
 static ECellDateEditValue*
@@ -472,16 +472,16 @@ get_datetime_from_utc (ECalModel *model, ECalModelComponent *comp_data, icalprop
 	return res;
 }
 
-static char *
+static void *
 get_summary (ECalModelComponent *comp_data)
 {
 	icalproperty *prop;
 
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_SUMMARY_PROPERTY);
 	if (prop)
-		return (char *) icalproperty_get_summary (prop);
+		return (void *) icalproperty_get_summary (prop);
 
-	return "";
+	return (void *) "";
 }
 
 static char *
@@ -579,7 +579,7 @@ ecm_value_at (ETableModel *etm, int col, int row)
 		return get_uid (comp_data);
 	}
 
-	return "";
+	return (void *) "";
 }
 
 static void
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index e51918f06c..5eba596680 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -70,16 +70,14 @@ enum TargetType{
 };
 
 static GtkTargetEntry target_types[] = {
-	{ "text/x-calendar", 0, TARGET_TYPE_VCALENDAR },
-	{ "text/calendar",   0, TARGET_TYPE_VCALENDAR }
+	{ (gchar *) "text/x-calendar", 0, TARGET_TYPE_VCALENDAR },
+	{ (gchar *) "text/calendar",   0, TARGET_TYPE_VCALENDAR }
 };
 
 static guint n_target_types = G_N_ELEMENTS (target_types);
 
 extern ECompEditorRegistry *comp_editor_registry;
 
-static void e_calendar_table_class_init		(ECalendarTableClass *class);
-static void e_calendar_table_init		(ECalendarTable	*cal_table);
 static void e_calendar_table_destroy		(GtkObject	*object);
 
 static void e_calendar_table_on_double_click	(ETable		*table,
@@ -1588,33 +1586,33 @@ delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem tasks_popup_items [] = {
-	{ E_POPUP_ITEM, "00.newtask", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0},
-	{ E_POPUP_BAR, "01.bar" },
+	{ E_POPUP_ITEM, (gchar *) "00.newtask", (gchar *) N_("New _Task"), on_new_task, NULL, (gchar *) "stock_task", 0, 0},
+	{ E_POPUP_BAR, (gchar *) "01.bar" },
 
-	{ E_POPUP_ITEM, "03.open", N_("_Open"), e_calendar_table_on_open_task, NULL, GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "05.openweb", N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL },
-	{ E_POPUP_ITEM, "10.saveas", N_("_Save As..."), e_calendar_table_on_save_as, NULL, GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "20.print", N_("P_rint..."), e_calendar_table_on_print_task, NULL, GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "03.open", (gchar *) N_("_Open"), e_calendar_table_on_open_task, NULL, (gchar *) GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "05.openweb", (gchar *) N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL },
+	{ E_POPUP_ITEM, (gchar *) "10.saveas", (gchar *) N_("_Save As..."), e_calendar_table_on_save_as, NULL, (gchar *) GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "20.print", (gchar *) N_("P_rint..."), e_calendar_table_on_print_task, NULL, (gchar *) GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE },
 
-	{ E_POPUP_BAR, "30.bar" },
+	{ E_POPUP_BAR, (gchar *) "30.bar" },
 
-	{ E_POPUP_ITEM, "40.cut", N_("C_ut"), e_calendar_table_on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "50.copy", N_("_Copy"), e_calendar_table_on_copy, NULL, GTK_STOCK_COPY, 0, 0 },
-	{ E_POPUP_ITEM, "60.paste", N_("_Paste"), e_calendar_table_on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "40.cut", (gchar *) N_("C_ut"), e_calendar_table_on_cut, NULL, (gchar *) GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "50.copy", (gchar *) N_("_Copy"), e_calendar_table_on_copy, NULL, (gchar *) GTK_STOCK_COPY, 0, 0 },
+	{ E_POPUP_ITEM, (gchar *) "60.paste", (gchar *) N_("_Paste"), e_calendar_table_on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
 
-	{ E_POPUP_BAR, "70.bar" },
+	{ E_POPUP_BAR, (gchar *) "70.bar" },
 
-	{ E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
-	{ E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
-	{ E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE },
-	{ E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE},
-	{ E_POPUP_ITEM, "d0.markmanyincomplete", N_("_Mark Selected Tasks as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_COMPLETE },
+	{ E_POPUP_ITEM, (gchar *) "80.assign", (gchar *) N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE },
+	{ E_POPUP_ITEM, (gchar *) "90.forward", (gchar *) N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, (gchar *) "mail-forward", E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "a0.markonecomplete", (gchar *) N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE},
+	{ E_POPUP_ITEM, (gchar *) "b0.markmanycomplete", (gchar *) N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE },
+	{ E_POPUP_ITEM, (gchar *) "c0.markoneincomplete", (gchar *) N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE},
+	{ E_POPUP_ITEM, (gchar *) "d0.markmanyincomplete", (gchar *) N_("_Mark Selected Tasks as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_COMPLETE },
 
-	{ E_POPUP_BAR, "e0.bar" },
+	{ E_POPUP_BAR, (gchar *) "e0.bar" },
 
-	{ E_POPUP_ITEM, "f0.delete", N_("_Delete"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "g0.deletemany", N_("_Delete Selected Tasks"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "f0.delete", (gchar *) N_("_Delete"), delete_cb, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "g0.deletemany", (gchar *) N_("_Delete Selected Tasks"), delete_cb, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE },
 };
 
 static void
diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 4ceb8910c3..f88ae08244 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -109,8 +109,8 @@ enum TargetType{
 };
 
 static GtkTargetEntry target_types[] = {
-	{ "text/x-calendar", 0, TARGET_TYPE_VCALENDAR },
-	{ "text/calendar",   0, TARGET_TYPE_VCALENDAR }
+	{ (gchar *) "text/x-calendar", 0, TARGET_TYPE_VCALENDAR },
+	{ (gchar *) "text/calendar",   0, TARGET_TYPE_VCALENDAR }
 };
 
 static guint n_target_types = G_N_ELEMENTS (target_types);
@@ -1788,52 +1788,52 @@ on_paste (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem ecv_main_items [] = {
-	{ E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 },
-	{ E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0},
-	{ E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0},
-	{ E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0},
+	{ E_POPUP_ITEM, (gchar *) "00.new", (gchar *) N_("New _Appointment..."), on_new_appointment, NULL, (gchar *) "appointment-new", 0, 0 },
+	{ E_POPUP_ITEM, (gchar *) "10.newallday", (gchar *) N_("New All Day _Event"), on_new_event, NULL, (gchar *) "stock_new-24h-appointment", 0, 0},
+	{ E_POPUP_ITEM, (gchar *) "20.meeting", (gchar *) N_("New _Meeting"), on_new_meeting, NULL, (gchar *) "stock_new-meeting", 0, 0},
+	{ E_POPUP_ITEM, (gchar *) "30.task", (gchar *) N_("New _Task"), on_new_task, NULL, (gchar *) "stock_task", 0, 0},
 
-	{ E_POPUP_BAR, "40."},
-	{ E_POPUP_ITEM, "40.print", N_("P_rint..."), on_print, NULL, GTK_STOCK_PRINT, 0, 0 },
+	{ E_POPUP_BAR, (gchar *) "40."},
+	{ E_POPUP_ITEM, (gchar *) "40.print", (gchar *) N_("P_rint..."), on_print, NULL, (gchar *) GTK_STOCK_PRINT, 0, 0 },
 
-	{ E_POPUP_BAR, "50." },
-	{ E_POPUP_ITEM, "50.paste", N_("_Paste"), on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_BAR, (gchar *) "50." },
+	{ E_POPUP_ITEM, (gchar *) "50.paste", (gchar *) N_("_Paste"), on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
 
-	{ E_POPUP_BAR, "60." },
+	{ E_POPUP_BAR, (gchar *) "60." },
 	/* FIXME: hook in this somehow */
-	{ E_POPUP_SUBMENU, "60.view", N_("_Current View") },
+	{ E_POPUP_SUBMENU, (gchar *) "60.view", (gchar *) N_("_Current View") },
 
-	{ E_POPUP_ITEM, "61.today", N_("Select T_oday"), on_goto_today, NULL, "go-today" },
-	{ E_POPUP_ITEM, "62.todate", N_("_Select Date..."), on_goto_date, NULL, GTK_STOCK_JUMP_TO },
+	{ E_POPUP_ITEM, (gchar *) "61.today", (gchar *) N_("Select T_oday"), on_goto_today, NULL, (gchar *) "go-today" },
+	{ E_POPUP_ITEM, (gchar *) "62.todate", (gchar *) N_("_Select Date..."), on_goto_date, NULL, (gchar *) GTK_STOCK_JUMP_TO },
 };
 
 static EPopupItem ecv_child_items [] = {
-	{ E_POPUP_ITEM, "00.open", N_("_Open"), on_edit_appointment, NULL, GTK_STOCK_OPEN, 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "10.saveas", N_("_Save As..."), on_save_as, NULL, GTK_STOCK_SAVE_AS, 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "20.print", N_("Pri_nt..."), on_print_event, NULL, GTK_STOCK_PRINT, 0, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "00.open", (gchar *) N_("_Open"), on_edit_appointment, NULL, (gchar *) GTK_STOCK_OPEN, 0, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "10.saveas", (gchar *) N_("_Save As..."), on_save_as, NULL, (gchar *) GTK_STOCK_SAVE_AS, 0, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "20.print", (gchar *) N_("Pri_nt..."), on_print_event, NULL, (gchar *) GTK_STOCK_PRINT, 0, E_CAL_POPUP_SELECT_NOTEDITING },
 
-	{ E_POPUP_BAR, "30." },
+	{ E_POPUP_BAR, (gchar *) "30." },
 
-	{ E_POPUP_ITEM, "31.cut", N_("C_ut"), on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ORGANIZER },
-	{ E_POPUP_ITEM, "32.copy", N_("_Copy"), on_copy, NULL, GTK_STOCK_COPY, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_ORGANIZER },
-	{ E_POPUP_ITEM, "33.paste", N_("_Paste"), on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "31.cut", (gchar *) N_("C_ut"), on_cut, NULL, (gchar *) GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ORGANIZER },
+	{ E_POPUP_ITEM, (gchar *) "32.copy", (gchar *) N_("_Copy"), on_copy, NULL, (gchar *) GTK_STOCK_COPY, 0, E_CAL_POPUP_SELECT_NOTEDITING|E_CAL_POPUP_SELECT_ORGANIZER },
+	{ E_POPUP_ITEM, (gchar *) "33.paste", (gchar *) N_("_Paste"), on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
 
-	{ E_POPUP_BAR, "40." },
+	{ E_POPUP_BAR, (gchar *) "40." },
 
-	{ E_POPUP_ITEM, "43.copyto", N_("Cop_y to Calendar..."), on_copy_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING},
-	{ E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
-	{ E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
-	{ E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "43.copyto", (gchar *) N_("Cop_y to Calendar..."), on_copy_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "44.moveto", (gchar *) N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "45.delegate", (gchar *) N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING},
+	{ E_POPUP_ITEM, (gchar *) "46.schedule", (gchar *) N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING },
+	{ E_POPUP_ITEM, (gchar *) "47.forward", (gchar *) N_("_Forward as iCalendar..."), on_forward, NULL, (gchar *) "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "48.reply", (gchar *) N_("_Reply"), on_reply, NULL, (gchar *) "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
+	{ E_POPUP_ITEM, (gchar *) "49.reply-all", (gchar *) N_("Reply to _All"), on_reply_all, NULL, (gchar *) "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING },
 
-	{ E_POPUP_BAR, "50." },
+	{ E_POPUP_BAR, (gchar *) "50." },
 
-	{ E_POPUP_ITEM, "51.delete", N_("_Delete"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_NONRECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "52.move", N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "53.delete", N_("Delete this _Occurrence"), on_delete_occurrence, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "54.delete", N_("Delete _All Occurrences"), on_delete_appointment, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "51.delete", (gchar *) N_("_Delete"), on_delete_appointment, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_NONRECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "52.move", (gchar *) N_("Make this Occurrence _Movable"), on_unrecur_appointment, NULL, NULL, E_CAL_POPUP_SELECT_RECURRING | E_CAL_POPUP_SELECT_INSTANCE, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "53.delete", (gchar *) N_("Delete this _Occurrence"), on_delete_occurrence, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "54.delete", (gchar *) N_("Delete _All Occurrences"), on_delete_appointment, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_RECURRING, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE },
 };
 
 static void
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 03d630c0f2..97f5ab59f6 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -617,12 +617,15 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 	gdouble cc = 65535.0;
 	gdouble date_fraction;
 	gboolean short_event = FALSE, resize_flag = FALSE;
-	gchar *end_resize_time, *end_resize_suffix;
+	const gchar *end_resize_suffix;
+	gchar *end_resize_time;
 	gint start_hour, start_display_hour, start_minute, start_suffix_width;
 	gint end_hour, end_display_hour, end_minute, end_suffix_width;
 	gboolean show_span = FALSE, format_time;
 	gint offset, interval;
-	char *text = NULL, *start_suffix, *end_suffix;
+	const gchar *start_suffix;
+	const gchar *end_suffix;
+	char *text = NULL;
 	int scroll_flag = 0;
 	gint row_y;
 	GConfClient *gconf;
diff --git a/calendar/gui/e-day-view-time-item.c b/calendar/gui/e-day-view-time-item.c
index dc3c2deba5..9d7ce44455 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -284,7 +284,8 @@ edvti_draw_zone (GnomeCanvasItem   *canvas_item,
 	EDayView *day_view;
 	EDayViewTimeItem *dvtmitem;
 	GtkStyle *style;
-	gchar buffer[64], *suffix, *midnight_day = NULL, *midnight_month = NULL;
+	const gchar *suffix;
+	gchar buffer[64], *midnight_day = NULL, *midnight_month = NULL;
 	gint hour, display_hour, minute, row;
 	gint row_y, start_y, large_hour_y_offset, small_font_y_offset;
 	gint long_line_x1, long_line_x2, short_line_x1;
diff --git a/calendar/gui/e-day-view-top-item.c b/calendar/gui/e-day-view-top-item.c
index 2f9bbf00fb..909379b3a6 100644
--- a/calendar/gui/e-day-view-top-item.c
+++ b/calendar/gui/e-day-view-top-item.c
@@ -375,7 +375,7 @@ e_day_view_top_item_draw_long_event (EDayViewTopItem *dvtitem,
 	gchar buffer[16];
 	gint hour, display_hour, minute, offset, time_width, time_x;
 	gint min_end_time_x, suffix_width, max_icon_x;
-	gchar *suffix;
+	const gchar *suffix;
 	gboolean draw_start_triangle, draw_end_triangle;
 	GdkRectangle clip_rect;
 	GSList *categories_list, *elem;
@@ -831,7 +831,7 @@ e_day_view_top_item_get_day_label (EDayView *day_view, gint day,
 {
 	struct icaltimetype day_start_tt;
 	struct tm day_start = { 0 };
-	gchar *format;
+	const gchar *format;
 
 	day_start_tt = icaltime_from_timet_with_zone (day_view->day_starts[day],
 						      FALSE,
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index d1d1cb4353..c8c06e6b89 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -108,9 +108,9 @@ enum {
 	TARGET_VCALENDAR
 };
 static GtkTargetEntry target_table[] = {
-	{ "application/x-e-calendar-event",     0, TARGET_CALENDAR_EVENT },
-	{ "text/x-calendar",                    0, TARGET_VCALENDAR },
-	{ "text/calendar",                      0, TARGET_VCALENDAR }
+	{ (gchar *) "application/x-e-calendar-event", 0, TARGET_CALENDAR_EVENT },
+	{ (gchar *) "text/x-calendar",                0, TARGET_VCALENDAR },
+	{ (gchar *) "text/calendar",                  0, TARGET_VCALENDAR }
 };
 static guint n_targets = sizeof(target_table) / sizeof(target_table[0]);
 
@@ -1838,9 +1838,9 @@ e_day_view_update_event_label (EDayView *day_view,
 			       gint event_num)
 {
 	EDayViewEvent *event;
-	char *text;
 	gboolean free_text = FALSE, editing_event = FALSE, short_event = FALSE;
 	const gchar *summary;
+	char *text;
 	gint interval;
 
 	event = &g_array_index (day_view->events[day], EDayViewEvent, event_num);
@@ -1850,7 +1850,7 @@ e_day_view_update_event_label (EDayView *day_view,
 		return;
 
 	summary = icalcomponent_get_summary (event->comp_data->icalcomp);
-	text = summary ? (char *) summary : "";
+	text = summary ? (char *) summary : (char *) "";
 
 	if (day_view->editing_event_day == day
 	    && day_view->editing_event_num == event_num)
@@ -7847,7 +7847,7 @@ void
 e_day_view_convert_time_to_display	(EDayView	*day_view,
 					 gint		 hour,
 					 gint		*display_hour,
-					 gchar	       **suffix,
+					 const gchar	**suffix,
 					 gint		*suffix_width)
 {
 	/* Calculate the actual hour number to display. For 12-hour
diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 1f518198fa..7cfb3c2dc6 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -595,7 +595,7 @@ void	   e_day_view_stop_auto_scroll		(EDayView	*day_view);
 void	   e_day_view_convert_time_to_display	(EDayView	*day_view,
 						 gint		 hour,
 						 gint		*display_hour,
-						 gchar	       **suffix,
+						 const gchar	**suffix,
 						 gint		*suffix_width);
 gint	   e_day_view_get_time_string_width	(EDayView	*day_view);
 
diff --git a/calendar/gui/e-itip-control.c b/calendar/gui/e-itip-control.c
index 5e6e62281e..bab36202d6 100644
--- a/calendar/gui/e-itip-control.c
+++ b/calendar/gui/e-itip-control.c
@@ -732,7 +732,7 @@ static const char *dayname[] = {
 	N_("Saturday")
 };
 
-static inline char *
+static const char *
 get_dayname (struct icalrecurrencetype *r, int i)
 {
 	enum icalrecurrencetype_weekday day;
diff --git a/calendar/gui/e-meeting-attendee.c b/calendar/gui/e-meeting-attendee.c
index 413c83894a..efa616535c 100644
--- a/calendar/gui/e-meeting-attendee.c
+++ b/calendar/gui/e-meeting-attendee.c
@@ -812,7 +812,6 @@ e_meeting_attendee_add_busy_period (EMeetingAttendee *ia,
 
 	g_return_val_if_fail (ia != NULL, FALSE);
 	g_return_val_if_fail (E_IS_MEETING_ATTENDEE (ia), FALSE);
-	g_return_val_if_fail (busy_type >= 0, FALSE);
 	g_return_val_if_fail (busy_type < E_MEETING_FREE_BUSY_LAST, FALSE);
 
 	priv = ia->priv;
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index aea75d4bd7..2d8a532727 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -64,11 +64,12 @@ static guint e_meeting_list_view_signals[LAST_SIGNAL] = { 0 };
 
 static void name_selector_dialog_close_cb (ENameSelectorDialog *dialog, gint response, gpointer data);
 
-static char *sections[] = {N_("Chair Persons"),
-			   N_("Required Participants"),
-			   N_("Optional Participants"),
-			   N_("Resources"),
-			   NULL};
+static const gchar *sections[] = {N_("Chair Persons"),
+				  N_("Required Participants"),
+				  N_("Optional Participants"),
+				  N_("Resources"),
+				  NULL};
+
 static icalparameter_role roles[] = {ICAL_ROLE_CHAIR,
 				     ICAL_ROLE_REQPARTICIPANT,
 				     ICAL_ROLE_OPTPARTICIPANT,
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index d320198ec3..a5bbffb78b 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -1100,7 +1100,7 @@ process_free_busy (EMeetingStoreQueueData *qdata, char *text)
  * In the returned newly allocated string.
 */
 static gchar *
-replace_string (gchar *string, gchar *from_value, gchar *to_value)
+replace_string (gchar *string, const gchar *from_value, gchar *to_value)
 {
 	gchar *replaced;
 	gchar **split_uri;
diff --git a/calendar/gui/e-memo-table.c b/calendar/gui/e-memo-table.c
index cc9f778568..35d6c2621b 100644
--- a/calendar/gui/e-memo-table.c
+++ b/calendar/gui/e-memo-table.c
@@ -64,8 +64,8 @@ enum TargetType{
 };
 
 static GtkTargetEntry target_types[] = {
-	{ "text/x-calendar", 0, TARGET_TYPE_VCALENDAR },
-	{ "text/calendar",   0, TARGET_TYPE_VCALENDAR }
+	{ (gchar *) "text/x-calendar", 0, TARGET_TYPE_VCALENDAR },
+	{ (gchar *) "text/calendar",   0, TARGET_TYPE_VCALENDAR }
 };
 
 static guint n_target_types = G_N_ELEMENTS (target_types);
@@ -73,8 +73,6 @@ static guint n_target_types = G_N_ELEMENTS (target_types);
 
 extern ECompEditorRegistry *comp_editor_registry;
 
-static void e_memo_table_class_init		(EMemoTableClass *klass);
-static void e_memo_table_init			(EMemoTable	*memo_table);
 static void e_memo_table_destroy		(GtkObject	*object);
 
 static void e_memo_table_on_double_click	(ETable		*table,
@@ -934,25 +932,25 @@ delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem memos_popup_items [] = {
-	{ E_POPUP_ITEM, "00.open", N_("_Open"), e_memo_table_on_open_memo, NULL, GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "05.openweb", N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL },
-	{ E_POPUP_ITEM, "10.saveas", N_("_Save As..."), e_memo_table_on_save_as, NULL, GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE },
-	{ E_POPUP_ITEM, "20.print", N_("P_rint..."), e_memo_table_on_print_memo, NULL, GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "00.open", (gchar *) N_("_Open"), e_memo_table_on_open_memo, NULL, (gchar *) GTK_STOCK_OPEN, E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "05.openweb", (gchar *) N_("Open _Web Page"), open_url_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_HASURL },
+	{ E_POPUP_ITEM, (gchar *) "10.saveas", (gchar *) N_("_Save As..."), e_memo_table_on_save_as, NULL, (gchar *) GTK_STOCK_SAVE_AS, E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "20.print", (gchar *) N_("P_rint..."), e_memo_table_on_print_memo, NULL, (gchar *) GTK_STOCK_PRINT, E_CAL_POPUP_SELECT_ONE },
 
-	{ E_POPUP_BAR, "30.bar" },
+	{ E_POPUP_BAR, (gchar *) "30.bar" },
 
-	{ E_POPUP_ITEM, "40.cut", N_("C_ut"), e_memo_table_on_cut, NULL, GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "50.copy", N_("_Copy"), e_memo_table_on_copy, NULL, GTK_STOCK_COPY, 0, 0 },
-	{ E_POPUP_ITEM, "60.paste", N_("_Paste"), e_memo_table_on_paste, NULL, GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "40.cut", (gchar *) N_("C_ut"), e_memo_table_on_cut, NULL, (gchar *) GTK_STOCK_CUT, 0, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "50.copy", (gchar *) N_("_Copy"), e_memo_table_on_copy, NULL, (gchar *) GTK_STOCK_COPY, 0, 0 },
+	{ E_POPUP_ITEM, (gchar *) "60.paste", (gchar *) N_("_Paste"), e_memo_table_on_paste, NULL, (gchar *) GTK_STOCK_PASTE, 0, E_CAL_POPUP_SELECT_EDITABLE },
 
-	{ E_POPUP_BAR, "70.bar" },
+	{ E_POPUP_BAR, (gchar *) "70.bar" },
 
-	{ E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE },
+	{ E_POPUP_ITEM, (gchar *) "80.forward", (gchar *) N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, (gchar *) "mail-forward", E_CAL_POPUP_SELECT_ONE },
 
-	{ E_POPUP_BAR, "90.bar" },
+	{ E_POPUP_BAR, (gchar *) "90.bar" },
 
-	{ E_POPUP_ITEM, "a0.delete", N_("_Delete"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE },
-	{ E_POPUP_ITEM, "b0.deletemany", N_("_Delete Selected Memos"), delete_cb, NULL, GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "a0.delete", (gchar *) N_("_Delete"), delete_cb, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE },
+	{ E_POPUP_ITEM, (gchar *) "b0.deletemany", (gchar *) N_("_Delete Selected Memos"), delete_cb, NULL, (gchar *) GTK_STOCK_DELETE, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE },
 };
 
 static void
diff --git a/calendar/gui/e-memos.c b/calendar/gui/e-memos.c
index 384743184a..c9f4681bf9 100644
--- a/calendar/gui/e-memos.c
+++ b/calendar/gui/e-memos.c
@@ -108,8 +108,8 @@ enum DndTargetType {
 };
 
 static GtkTargetEntry list_drag_types[] = {
-	{ "text/calendar",                0, TARGET_VCALENDAR },
-	{ "text/x-calendar",              0, TARGET_VCALENDAR }
+	{ (gchar *) "text/calendar",   0, TARGET_VCALENDAR },
+	{ (gchar *) "text/x-calendar", 0, TARGET_VCALENDAR }
 };
 static const int num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]);
 
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index 4efb688ae0..eabe4d72d2 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -113,8 +113,8 @@ enum DndTargetType {
 };
 
 static GtkTargetEntry list_drag_types[] = {
-	{ "text/calendar",                0, TARGET_VCALENDAR },
-	{ "text/x-calendar",              0, TARGET_VCALENDAR }
+	{ (gchar *) "text/calendar",   0, TARGET_VCALENDAR },
+	{ (gchar *) "text/x-calendar", 0, TARGET_VCALENDAR }
 };
 static const int num_list_drag_types = sizeof (list_drag_types) / sizeof (list_drag_types[0]);
 
diff --git a/calendar/gui/e-week-view-event-item.c b/calendar/gui/e-week-view-event-item.c
index dcb3dd96f5..49513e96e5 100644
--- a/calendar/gui/e-week-view-event-item.c
+++ b/calendar/gui/e-week-view-event-item.c
@@ -636,7 +636,8 @@ e_week_view_draw_time	(EWeekView	*week_view,
 	GdkGC *gc;
 	gint hour_to_display, suffix_width;
 	gint time_y_normal_font, time_y_small_font;
-	gchar buffer[128], *suffix;
+	const gchar *suffix;
+	gchar buffer[128];
 	PangoLayout *layout;
 	PangoFontDescription *small_font_desc;
 
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index 316ba5effc..52fabef69e 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -4378,7 +4378,7 @@ void
 e_week_view_convert_time_to_display	(EWeekView	*week_view,
 					 gint		 hour,
 					 gint		*display_hour,
-					 gchar	       **suffix,
+					 const gchar	**suffix,
 					 gint		*suffix_width)
 {
 	/* Calculate the actual hour number to display. For 12-hour
diff --git a/calendar/gui/e-week-view.h b/calendar/gui/e-week-view.h
index 2458efcdd1..e62b2f63cd 100644
--- a/calendar/gui/e-week-view.h
+++ b/calendar/gui/e-week-view.h
@@ -433,7 +433,7 @@ void	   e_week_view_show_popup_menu		(EWeekView	*week_view,
 void	   e_week_view_convert_time_to_display	(EWeekView	*week_view,
 						 gint		 hour,
 						 gint		*display_hour,
-						 gchar	       **suffix,
+						 const gchar	**suffix,
 						 gint		*suffix_width);
 gint	   e_week_view_get_time_string_width	(EWeekView	*week_view);
 
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index 87c61bb418..991df095b3 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -2645,13 +2645,13 @@ gc_define_views(EPopup *ep, EPopupItem *pitem, void *data)
 static EPopupItem gc_popups[] = {
 	/* Code generates the path to fit */
 	{ E_POPUP_BAR, NULL },
-	{ E_POPUP_RADIO|E_POPUP_ACTIVE, NULL, N_("_Custom View"), },
-	{ E_POPUP_ITEM, NULL, N_("_Save Custom View"), gc_save_custom_view },
+	{ E_POPUP_RADIO|E_POPUP_ACTIVE, NULL, (gchar *) N_("_Custom View"), },
+	{ E_POPUP_ITEM, NULL, (gchar *) N_("_Save Custom View"), gc_save_custom_view },
 
 	/* index == 3, when we have non-custom view */
 
 	{ E_POPUP_BAR, NULL },
-	{ E_POPUP_ITEM, NULL, N_("_Define Views..."), gc_define_views },
+	{ E_POPUP_ITEM, NULL, (gchar *) N_("_Define Views..."), gc_define_views },
 };
 
 static void
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index e1a86dab25..1cf2005e3f 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -112,8 +112,6 @@ GtkWidget *gnome_calendar_new			(void);
 void gnome_calendar_set_activity_handler (GnomeCalendar *cal, EActivityHandler *activity_handler);
 void gnome_calendar_set_ui_component (GnomeCalendar *cal, BonoboUIComponent *ui_component);
 
-ECalendarTable *gnome_calendar_get_task_pad	(GnomeCalendar *gcal);
-
 ECalModel *gnome_calendar_get_calendar_model    (GnomeCalendar *gcal);
 ECal *gnome_calendar_get_default_client    (GnomeCalendar *gcal);
 
@@ -201,8 +199,6 @@ void       gnome_calendar_edit_appointment      (GnomeCalendar *gcal,
 						 const char* comp_uid,
 						 const char* comp_rid);
 
-GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
-
 void gnome_calendar_emit_user_created_signal  (gpointer instance, GnomeCalendar *gcal, ECal *calendar);
 
 G_END_DECLS
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index 829ac287ce..30ad9822c7 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -40,7 +40,7 @@
 #include <mail/em-composer-utils.h>
 #include <camel/camel-mime-filter-tohtml.h>
 
-static gchar *itip_methods[] = {
+static const gchar *itip_methods[] = {
 	"PUBLISH",
 	"REQUEST",
 	"REPLY",
@@ -1373,7 +1373,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 
 		GString *body;
 		char *orig_from = NULL;
-		char *description = NULL;
+		const char *description = NULL;
 		char *subject = NULL;
 		const char *location = NULL;
 		char *time = NULL;
@@ -1390,7 +1390,7 @@ reply_to_calendar_comp (ECalComponentItipMethod method,
 		if (text_list){
 			ECalComponentText text = *((ECalComponentText *)text_list->data);
 	                if (text.value)
-	                        description = (char *)text.value;
+	                        description = text.value;
         	        else
                 	        description = "";
 	        } else {
diff --git a/calendar/gui/main.c b/calendar/gui/main.c
index 2085bb20af..14b8267167 100644
--- a/calendar/gui/main.c
+++ b/calendar/gui/main.c
@@ -96,7 +96,8 @@ launch_alarm_daemon_cb (gpointer data)
 
 	/* activate the alarm daemon */
 	CORBA_exception_init (&ev);
-	an = bonobo_activation_activate_from_id ("OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION, 0, NULL, &ev);
+	an = bonobo_activation_activate_from_id (
+		(Bonobo_ActivationID) "OAFIID:GNOME_Evolution_Calendar_AlarmNotify:" BASE_VERSION, 0, NULL, &ev);
 
 	if (BONOBO_EX (&ev)) {
 		g_message ("launch_alarm_daemon_cb(): %s", bonobo_exception_get_text (&ev));
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 66b6f6a2ec..1ed3fb1634 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -67,8 +67,8 @@ enum DndTargetType {
 #define PERSONAL_RELATIVE_URI "system"
 
 static GtkTargetEntry drag_types[] = {
-	{ CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST },
-	{ XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }
+	{ (gchar *) CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST },
+	{ (gchar *) XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }
 };
 static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
 
@@ -476,17 +476,17 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem emc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 },
-	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_memo_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_memo_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Memo List"), new_memo_list_cb, NULL, (gchar *) "stock_notes", 0, 0 },
+	{ E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_memo_list_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_memo_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
-	{ E_POPUP_BAR, "20.bar" },
-	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.mark_memos_offline", N_("_Make available for offline use"), mark_offline_cb, NULL, "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
-	{ E_POPUP_ITEM, "40.mark_memos_no_offline", N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
+	{ E_POPUP_BAR, (gchar *) "20.bar" },
+	{ E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_memo_list_cb, NULL, (gchar *) "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "30.mark_memos_offline", (gchar *) N_("_Make available for offline use"), mark_offline_cb, NULL, (gchar *) "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
+	{ E_POPUP_ITEM, (gchar *) "40.mark_memos_no_offline", (gchar *) N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, (gchar *) "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
 
-	{ E_POPUP_BAR, "99.bar" },
-	{ E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_memo_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_BAR, (gchar *) "99.bar" },
+	{ E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_memo_list_cb, NULL, (gchar *) "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -1039,28 +1039,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	CORBA_sequence_set_release (list, FALSE);
 
-	list->_buffer[0].id = CREATE_MEMO_ID;
-	list->_buffer[0].description = _("New memo");
+	list->_buffer[0].id = (char *) CREATE_MEMO_ID;
+	list->_buffer[0].description = (char *) _("New memo");
 	list->_buffer[0].menuDescription = (char *) C_("New", "Mem_o");
-	list->_buffer[0].tooltip = _("Create a new memo");
+	list->_buffer[0].tooltip = (char *) _("Create a new memo");
 	list->_buffer[0].menuShortcut = 'o';
-	list->_buffer[0].iconName = "stock_insert-note";
+	list->_buffer[0].iconName = (char *) "stock_insert-note";
 	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[1].id = CREATE_SHARED_MEMO_ID;
-	list->_buffer[1].description = _("New shared memo");
+	list->_buffer[1].id = (char *) CREATE_SHARED_MEMO_ID;
+	list->_buffer[1].description = (char *) _("New shared memo");
 	list->_buffer[1].menuDescription = (char *) C_("New", "_Shared memo");
-	list->_buffer[1].tooltip = _("Create a shared new memo");
+	list->_buffer[1].tooltip = (char *) _("Create a shared new memo");
 	list->_buffer[1].menuShortcut = 'h';
-	list->_buffer[1].iconName = "stock_insert-note";
+	list->_buffer[1].iconName = (char *) "stock_insert-note";
 	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[2].id = CREATE_MEMO_LIST_ID;
-	list->_buffer[2].description = _("New memo list");
+	list->_buffer[2].id = (char *) CREATE_MEMO_LIST_ID;
+	list->_buffer[2].description = (char *) _("New memo list");
 	list->_buffer[2].menuDescription = (char *) C_("New", "Memo li_st");
-	list->_buffer[2].tooltip = _("Create a new memo list");
+	list->_buffer[2].tooltip = (char *) _("Create a new memo list");
 	list->_buffer[2].menuShortcut = '\0';
-	list->_buffer[2].iconName = "stock_notes";
+	list->_buffer[2].iconName = (char *) "stock_notes";
 	list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
 
 	return list;
diff --git a/calendar/gui/print.c b/calendar/gui/print.c
index adbfc2cc77..943a4af2ee 100644
--- a/calendar/gui/print.c
+++ b/calendar/gui/print.c
@@ -510,7 +510,7 @@ enum datefmt {
 	DATE_YEAR	= 1 << 3
 };
 
-static char *days[] = {
+static const gchar *days[] = {
 	N_("1st"), N_("2nd"), N_("3rd"), N_("4th"), N_("5th"),
 	N_("6th"), N_("7th"), N_("8th"), N_("9th"), N_("10th"),
 	N_("11th"), N_("12th"), N_("13th"), N_("14th"), N_("15th"),
@@ -592,8 +592,9 @@ print_month_small (GtkPrintContext *context, GnomeCalendar *gcal, time_t month,
 	double cell_top, cell_bottom, cell_left, cell_right, text_right;
 
 	/* Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday */
-	char *daynames[] = { N_("Su"), N_("Mo"), N_("Tu"), N_("We"),
-			     N_("Th"), N_("Fr"), N_("Sa") };
+	const gchar *daynames[] =
+		{ N_("Su"), N_("Mo"), N_("Tu"), N_("We"),
+		  N_("Th"), N_("Fr"), N_("Sa") };
 	cairo_t *cr;
 
 	/* Print the title, e.g. 'June 2001', in the top 16% of the area. */
@@ -1061,22 +1062,23 @@ print_attendees (GtkPrintContext *context, PangoFontDescription *font, cairo_t *
 	return top;
 }
 
-static char *
+static gchar *
 get_summary_with_location (icalcomponent *icalcomp)
 {
 	const gchar *summary, *location;
-	char *text;
+	gchar *text;
 
 	g_return_val_if_fail (icalcomp != NULL, NULL);
 
 	summary = icalcomponent_get_summary (icalcomp);
-	text = summary ? (char*) summary : "";
+	if (summary == NULL)
+		summary = "";
 
 	location = icalcomponent_get_location (icalcomp);
 	if (location && *location) {
-		text = g_strdup_printf ("%s (%s)", text, location);
+		text = g_strdup_printf ("%s (%s)", summary, location);
 	} else {
-		text = g_strdup (text);
+		text = g_strdup (summary);
 	}
 
 	return text;
@@ -1628,7 +1630,8 @@ print_week_view_background (GtkPrintContext *context,
 	struct tm tm;
 	int day, day_x, day_y, day_h;
 	double x1, x2, y1, y2, font_size, fillcolor;
-	char *format_string, buffer[128];
+	const gchar *format_string;
+	gchar buffer[128];
 	cairo_t *cr;
 
 	font_size = get_font_size (font);
@@ -2271,7 +2274,11 @@ print_year_view (GtkPrintContext *context, GnomeCalendar *gcal, time_t date)
 #endif
 
 static void
-write_label_piece (time_t t, char *buffer, int size, char *stext, char *etext)
+write_label_piece (time_t t,
+                   gchar *buffer,
+                   gint size,
+                   gchar *stext,
+                   const gchar *etext)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
 	struct tm *tmp_tm;
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 25bf06bda1..2d17f5783f 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -66,8 +66,8 @@ enum DndTargetType {
 #define PERSONAL_RELATIVE_URI "system"
 
 static GtkTargetEntry drag_types[] = {
-	{ CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST },
-	{ XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }
+	{ (gchar *) CALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST },
+	{ (gchar *) XCALENDAR_TYPE, 0, DND_TARGET_TYPE_CALENDAR_LIST }
 };
 static gint num_drag_types = sizeof(drag_types) / sizeof(drag_types[0]);
 
@@ -468,17 +468,17 @@ mark_offline_cb (EPopup *ep, EPopupItem *pitem, void *data)
 }
 
 static EPopupItem etc_source_popups[] = {
-	{ E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 },
-	{ E_POPUP_ITEM, "15.copy", N_("_Copy..."), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "18.rename", N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "10.new", (gchar *) N_("_New Task List"), new_task_list_cb, NULL, (gchar *) "stock_todo", 0, 0 },
+	{ E_POPUP_ITEM, (gchar *) "15.copy", (gchar *) N_("_Copy..."), copy_task_list_cb, NULL, (gchar *) "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "18.rename", (gchar *) N_("_Rename..."), rename_task_list_cb, NULL, NULL, 0, E_CAL_POPUP_SOURCE_PRIMARY },
 
-	{ E_POPUP_BAR, "20.bar" },
-	{ E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
-	{ E_POPUP_ITEM, "30.mark_tasks_offline", N_("_Make available for offline use"), mark_offline_cb, NULL, "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
-	{ E_POPUP_ITEM, "40.mark_tasks_no_offline", N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
+	{ E_POPUP_BAR, (gchar *) "20.bar" },
+	{ E_POPUP_ITEM, (gchar *) "20.delete", (gchar *) N_("_Delete"), delete_task_list_cb, NULL, (gchar *) "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_ITEM, (gchar *) "30.mark_tasks_offline", (gchar *) N_("_Make available for offline use"), mark_offline_cb, NULL, (gchar *) "stock_disconnect", E_CAL_POPUP_SOURCE_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_OFFLINE },
+	{ E_POPUP_ITEM, (gchar *) "40.mark_tasks_no_offline", (gchar *) N_("_Do not make available for offline use"), mark_no_offline_cb, NULL, (gchar *) "stock_connect", E_CAL_POPUP_SOURCE_NO_OFFLINE, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_NO_OFFLINE },
 
-	{ E_POPUP_BAR, "99.bar" },
-	{ E_POPUP_ITEM, "99.properties", N_("_Properties"), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
+	{ E_POPUP_BAR, (gchar *) "99.bar" },
+	{ E_POPUP_ITEM, (gchar *) "99.properties", (gchar *) N_("_Properties"), edit_task_list_cb, NULL, (gchar *) "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY },
 };
 
 static void
@@ -1110,28 +1110,28 @@ impl__get_userCreatableItems (PortableServer_Servant servant,
 
 	CORBA_sequence_set_release (list, FALSE);
 
-	list->_buffer[0].id = CREATE_TASK_ID;
-	list->_buffer[0].description = _("New task");
+	list->_buffer[0].id = (char *) CREATE_TASK_ID;
+	list->_buffer[0].description = (char *) _("New task");
 	list->_buffer[0].menuDescription = (char *) C_("New", "_Task");
-	list->_buffer[0].tooltip = _("Create a new task");
+	list->_buffer[0].tooltip = (char *) _("Create a new task");
 	list->_buffer[0].menuShortcut = 't';
-	list->_buffer[0].iconName = "stock_task";
+	list->_buffer[0].iconName = (char *) "stock_task";
 	list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[1].id = CREATE_TASK_ASSIGNED_ID;
-	list->_buffer[1].description = _("New assigned task");
+	list->_buffer[1].id = (char *) CREATE_TASK_ASSIGNED_ID;
+	list->_buffer[1].description = (char *) _("New assigned task");
 	list->_buffer[1].menuDescription = (char *) C_("New", "Assigne_d Task");
-	list->_buffer[1].tooltip = _("Create a new assigned task");
+	list->_buffer[1].tooltip = (char *) _("Create a new assigned task");
 	list->_buffer[1].menuShortcut = '\0';
-	list->_buffer[1].iconName = "stock_task";
+	list->_buffer[1].iconName = (char *) "stock_task";
 	list->_buffer[1].type = GNOME_Evolution_CREATABLE_OBJECT;
 
-	list->_buffer[2].id = CREATE_TASK_LIST_ID;
-	list->_buffer[2].description = _("New task list");
+	list->_buffer[2].id = (char *) CREATE_TASK_LIST_ID;
+	list->_buffer[2].description = (char *) _("New task list");
 	list->_buffer[2].menuDescription = (char *) C_("New", "Tas_k list");
-	list->_buffer[2].tooltip = _("Create a new task list");
+	list->_buffer[2].tooltip = (char *) _("Create a new task list");
 	list->_buffer[2].menuShortcut = '\0';
-	list->_buffer[2].iconName = "stock_todo";
+	list->_buffer[2].iconName = (char *) "stock_todo";
 	list->_buffer[2].type = GNOME_Evolution_CREATABLE_FOLDER;
 
 	return list;
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 0d83becf21..9732f2f7e7 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -154,7 +154,7 @@ tasks_control_activate_cb		(BonoboControl		*control,
 }
 
 struct _tasks_sensitize_item {
-	char *command;
+	const gchar *command;
 	guint32 enable;
 };
 
diff --git a/calendar/gui/weekday-picker.c b/calendar/gui/weekday-picker.c
index 613e62c1ca..6681829afa 100644
--- a/calendar/gui/weekday-picker.c
+++ b/calendar/gui/weekday-picker.c
@@ -70,8 +70,6 @@ enum {
 	LAST_SIGNAL
 };
 
-static void weekday_picker_class_init (WeekdayPickerClass *class);
-static void weekday_picker_init (WeekdayPicker *wp);
 static void weekday_picker_destroy (GtkObject *object);
 
 static void weekday_picker_realize (GtkWidget *widget);