Fixes #332101

svn path=/trunk/; revision=32902

28 files changed, 65 insertions, 60 deletions

diff --git a/calendar/gui/cal-search-bar.c b/calendar/gui/cal-search-bar.c
index 501a762853..6e5751d2cc 100644
--- a/calendar/gui/cal-search-bar.c
+++ b/calendar/gui/cal-search-bar.c
@@ -30,6 +30,7 @@
 #include <gtk/gtkoptionmenu.h>
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
+#include <libedataserver/e-categories.h>
 #include <e-util/e-icon-factory.h>
 #include <libedataserver/e-categories.h>
 #include "cal-search-bar.h"
@@ -252,7 +253,7 @@ notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const c
 	    sexp = g_strdup_printf ("(contains? \"%s\" \"%s\")", field, text);
 	    g_free (text);
 	} else 
-	    sexp = g_strdup_printf ("(contains? \"summary\" \"\")", field, text); /* Show all */
+	    sexp = g_strdup ("(contains? \"summary\" \"\")"); /* Show all */
 
 
 	/* Apply the selected view on search */
@@ -264,6 +265,7 @@ notify_e_cal_view_contains (CalSearchBar *cal_search, const char *field, const c
 	g_free (sexp);
 }
 
+#if 0
 /* Sets the query string to the appropriate match for categories */
 static void
 notify_category_is (CalSearchBar *cal_search)
@@ -280,13 +282,14 @@ notify_category_is (CalSearchBar *cal_search)
 	if (sexp)
 		g_free (sexp);
 }
+#endif
 
 /* Creates a new query from the values in the widgets and notifies upstream */
 static void
 regen_query (CalSearchBar *cal_search)
 {
 	int id;
-	const char *category_sexp, *category;
+	const char *category_sexp;
 
 	/* Fetch the data from the ESearchBar's entry widgets */
 	id = e_search_bar_get_item_id (E_SEARCH_BAR (cal_search));
@@ -321,6 +324,7 @@ regen_query (CalSearchBar *cal_search)
 	}
 }
 
+#if 0
 static void
 regen_view_query (CalSearchBar *cal_search)
 {
@@ -331,6 +335,8 @@ regen_view_query (CalSearchBar *cal_search)
 	gtk_signal_emit (GTK_OBJECT (cal_search), cal_search_bar_signals[CATEGORY_CHANGED],
 			 category);
 }
+#endif
+
 /* search_activated handler for the calendar search bar */
 static void
 cal_search_bar_search_activated (ESearchBar *search)
@@ -375,7 +381,6 @@ generate_viewoption_menu (CALSearchBarItem *subitems)
 {
 	GtkWidget *menu, *menu_item;
 	gint i = 0;
-	GSList *l;
 
 	menu = gtk_menu_new ();
 
@@ -444,7 +449,7 @@ make_suboptions (CalSearchBar *cal_search)
 
 			  subitems[i + CATEGORIES_OFFSET].search.text      = str;
 			  subitems[i + CATEGORIES_OFFSET].search.id        = i + CATEGORIES_OFFSET;
-			  subitems[i + CATEGORIES_OFFSET].image        = e_categories_get_icon_file_for(str);
+			  subitems[i + CATEGORIES_OFFSET].image        = g_strdup (e_categories_get_icon_file_for(str));
 		 }
 
 		 subitems[i + CATEGORIES_OFFSET].search.id = -1; /* terminator */
@@ -461,9 +466,10 @@ make_suboptions (CalSearchBar *cal_search)
 	e_search_bar_set_viewoption_menu ((ESearchBar *)cal_search, menu);
 	
 	/* Free the strings */
-	for (i = 0; i < priv->categories->len; i++)
+	for (i = 0; i < priv->categories->len; i++) {
 		g_free (subitems[i + CATEGORIES_OFFSET].search.text);
-
+		g_free (subitems[i + CATEGORIES_OFFSET].image);
+	}
 	g_free (subitems);
 }
 
diff --git a/calendar/gui/dialogs/cal-attachment-select-file.c b/calendar/gui/dialogs/cal-attachment-select-file.c
index 79e4a75a77..3c101f860c 100644
--- a/calendar/gui/dialogs/cal-attachment-select-file.c
+++ b/calendar/gui/dialogs/cal-attachment-select-file.c
@@ -82,7 +82,7 @@ run_selector(CompEditor *editor, const char *title, guint32 flags, gboolean *sho
 							 NULL);
 	
 	gtk_dialog_set_default_response (GTK_DIALOG (selection), GTK_RESPONSE_OK);
-	gtk_file_chooser_set_local_only (selection, FALSE);
+	gtk_file_chooser_set_local_only (GTK_FILE_CHOOSER (selection), FALSE);
 	
 	if ((flags & SELECTOR_MODE_SAVE) == 0)
 		gtk_file_chooser_set_select_multiple ((GtkFileChooser *) selection, (flags & SELECTOR_MODE_MULTI));
diff --git a/calendar/gui/dialogs/comp-editor.c b/calendar/gui/dialogs/comp-editor.c
index 9bd5021049..85af6bd892 100644
--- a/calendar/gui/dialogs/comp-editor.c
+++ b/calendar/gui/dialogs/comp-editor.c
@@ -2378,7 +2378,7 @@ fill_widgets (CompEditor *editor)
 		GSList *attachment_list = NULL;
 		e_cal_component_get_attachment_list (priv->comp, &attachment_list);
 		set_attachment_list (editor, attachment_list);
-		g_slist_foreach (attachment_list, g_free, NULL);
+		g_slist_foreach (attachment_list, (GFunc)g_free, NULL);
 		g_slist_free (attachment_list);
 	}	
 
diff --git a/calendar/gui/dialogs/delete-comp.c b/calendar/gui/dialogs/delete-comp.c
index 113849b81c..c11cb29624 100644
--- a/calendar/gui/dialogs/delete-comp.c
+++ b/calendar/gui/dialogs/delete-comp.c
@@ -201,7 +201,7 @@ prompt_retract_dialog (ECalComponent *comp, char **retract_text, GtkWidget *pare
 	gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 	
 	gtk_box_set_spacing ((GtkBox *) (GTK_DIALOG (dialog)->vbox), 12);
-	vbox = GTK_CONTAINER (GTK_DIALOG (dialog)->vbox);
+	vbox = GTK_WIDGET (GTK_DIALOG (dialog)->vbox);
 
 	cb = gtk_check_button_new_with_mnemonic (_("_Delete this item from all other recipient's mailboxes?"));
 	gtk_container_add (GTK_CONTAINER (vbox), cb);
diff --git a/calendar/gui/dialogs/event-page.c b/calendar/gui/dialogs/event-page.c
index 179ea27ac8..4d419b317d 100644
--- a/calendar/gui/dialogs/event-page.c
+++ b/calendar/gui/dialogs/event-page.c
@@ -2746,6 +2746,7 @@ alarm_store_changed_cb (EAlarmList *alarm_list_store, GtkTreePath *path, GtkTree
 	field_changed_cb (NULL, data);
 }
 
+#if 0
 static void
 alarm_custom_clicked_cb (GtkWidget *widget, gpointer data)
 {
@@ -2789,6 +2790,7 @@ alarm_custom_clicked_cb (GtkWidget *widget, gpointer data)
 
 	sensitize_widgets (epage);
 }
+#endif
 
 /* Hooks the widget signals */
 static gboolean
@@ -2799,7 +2801,7 @@ init_widgets (EventPage *epage)
 	icaltimezone *zone;
 	char *menu_label = NULL;
 	GtkTreeSelection *selection;
-	GtkWidget *w, *cus_label, *cus_item, *menu;
+	GtkWidget *w, *cus_item, *menu;
 	
 	priv = epage->priv;
 
diff --git a/calendar/gui/dialogs/memo-editor.c b/calendar/gui/dialogs/memo-editor.c
index b6f70fbc5b..081d6aac96 100644
--- a/calendar/gui/dialogs/memo-editor.c
+++ b/calendar/gui/dialogs/memo-editor.c
@@ -244,9 +244,6 @@ memo_editor_set_e_cal (CompEditor *editor, ECal *client)
 static void
 memo_editor_edit_comp (CompEditor *editor, ECalComponent *comp)
 {
-	CompEditorFlags flags = comp_editor_get_flags (editor);
-	ECal *client = comp_editor_get_e_cal (editor);
-	
 	if (COMP_EDITOR_CLASS (memo_editor_parent_class)->edit_comp)
 		COMP_EDITOR_CLASS (memo_editor_parent_class)->edit_comp (editor, comp);
 }
diff --git a/calendar/gui/dialogs/memo-page.c b/calendar/gui/dialogs/memo-page.c
index 487bfcce02..655738894c 100644
--- a/calendar/gui/dialogs/memo-page.c
+++ b/calendar/gui/dialogs/memo-page.c
@@ -535,11 +535,11 @@ fill_comp_with_recipients (ENameSelector *name_selector, ECalComponent *comp)
 				continue;
 		
 			if (!str) {
-				str = g_string_new ("");
+				str = g_string_new (NULL);
 				g_string_prepend (str, attendee);
 				continue;
 			}
-			g_string_prepend (str, ";");
+			g_string_prepend_c (str, ';');
 			g_string_prepend (str, attendee);
 		}
 	}
diff --git a/calendar/gui/e-cal-component-memo-preview.c b/calendar/gui/e-cal-component-memo-preview.c
index 9f235b16f4..192ad70ee1 100644
--- a/calendar/gui/e-cal-component-memo-preview.c
+++ b/calendar/gui/e-cal-component-memo-preview.c
@@ -158,7 +158,7 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 	e_cal_component_get_categories_list (comp, &l);
 	if (l) {
 		GSList *node;
-		GString *string = g_string_new ("");
+		GString *string = g_string_new (NULL);
 		
 		
 		gtk_html_stream_printf(stream, "<H3>Categories: ");
@@ -186,7 +186,9 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 		}
 		
 		gtk_html_stream_printf(stream, string->str);
-		
+
+		g_string_free (string, TRUE);
+	
 		gtk_html_stream_printf(stream, "</H3>");
 
 		e_cal_component_free_categories_list (l);
@@ -220,17 +222,17 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 
 		for (node = l; node != NULL; node = node->next) {
 			gint i, j;
-			GString *string = g_string_new ("");
+			GString *string = g_string_new (NULL);
 
 			text = * (ECalComponentText *) node->data;
 			for (i = 0, j=0; i < strlen (text.value ? text.value : 0); i++, j++) {
 				if (text.value[i] == '\n'){
-					string = g_string_append (string, "<BR>");
+					string = g_string_append_len (string, "<BR>", 4);
 				}
 				else if (text.value[i] == '<')
-					string = g_string_append (string, "&lt;");
+					string = g_string_append_len (string, "&lt;", 4);
 				else if (text.value[i] == '>')
-					string = g_string_append (string, "&gt;");
+					string = g_string_append_len (string, "&gt;", 4);
 				else
 					string = g_string_append_c (string, text.value[i]);
 			}
diff --git a/calendar/gui/e-cal-component-preview.c b/calendar/gui/e-cal-component-preview.c
index 5a6a056d8c..d38ec5f195 100644
--- a/calendar/gui/e-cal-component-preview.c
+++ b/calendar/gui/e-cal-component-preview.c
@@ -272,16 +272,16 @@ write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone
 
 		for (node = l; node != NULL; node = node->next) {
 			gint i;
-			GString *string = g_string_new ("");;
+			GString *string = g_string_new (NULL);;
 
 			text = * (ECalComponentText *) node->data;
 			for (i = 0; i < strlen (text.value ? text.value : 0); i++) {
 				if (text.value[i] == '\n')
-					string = g_string_append (string, "<BR>");
+					string = g_string_append_len (string, "<BR>", 4);
 				else if (text.value[i] == '<')
-					string = g_string_append (string, "&lt;");
+					string = g_string_append_len (string, "&lt;", 4);
 				else if (text.value[i] == '>')
-					string = g_string_append (string, "&gt;");
+					string = g_string_append_len (string, "&gt;", 4);
 				else
 					string = g_string_append_c (string, text.value[i]);
 			}
diff --git a/calendar/gui/e-cal-model-tasks.c b/calendar/gui/e-cal-model-tasks.c
index 5875717b58..75cb23b175 100644
--- a/calendar/gui/e-cal-model-tasks.c
+++ b/calendar/gui/e-cal-model-tasks.c
@@ -1111,8 +1111,7 @@ void
 e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row)
 {
  	ECalModelComponent *comp_data; 
-	icalproperty *prop,*prop1,*prop2;
-	gboolean set_completed = TRUE;
+	icalproperty *prop,*prop1;
 
  	g_return_if_fail (E_IS_CAL_MODEL_TASKS (model)); 
  	g_return_if_fail (model_row >= 0 && model_row < e_table_model_row_count (E_TABLE_MODEL (model))); 
diff --git a/calendar/gui/e-cal-model.c b/calendar/gui/e-cal-model.c
index 2658124192..0797144c3e 100644
--- a/calendar/gui/e-cal-model.c
+++ b/calendar/gui/e-cal-model.c
@@ -349,7 +349,7 @@ get_description (ECalModelComponent *comp_data)
 	
 	prop = icalcomponent_get_first_property (comp_data->icalcomp, ICAL_DESCRIPTION_PROPERTY);
 	if (prop) {
-		str = g_string_new ("");
+		str = g_string_new (NULL);
 		do {
 			str = g_string_append (str, icalproperty_get_description (prop));
 		} while ((prop = icalcomponent_get_next_property (comp_data->icalcomp, ICAL_DESCRIPTION_PROPERTY)));
@@ -2098,7 +2098,7 @@ e_cal_model_get_object_array (ECalModel *model)
 }
 
 void
-e_cal_model_set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone)
+e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezone *zone)
 {
 	struct icaltimetype start_time, end_time;
 
diff --git a/calendar/gui/e-cal-model.h b/calendar/gui/e-cal-model.h
index d98d81bbfc..5fcef40a29 100644
--- a/calendar/gui/e-cal-model.h
+++ b/calendar/gui/e-cal-model.h
@@ -153,7 +153,7 @@ void                e_cal_model_generate_instances             (ECalModel
 								ECalRecurInstanceFn  cb,
 								gpointer             cb_data);
 GPtrArray * e_cal_model_get_object_array (ECalModel *model);
-void e_cal_model_set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone);
+void e_cal_model_set_instance_times (ECalModelComponent *comp_data, const icaltimezone *zone);
 
 
 
diff --git a/calendar/gui/e-cal-popup.c b/calendar/gui/e-cal-popup.c
index 6020cd4b07..280db93e89 100644
--- a/calendar/gui/e-cal-popup.c
+++ b/calendar/gui/e-cal-popup.c
@@ -381,7 +381,6 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data)
 		g_free (mime_type);
 
 		if (apps) {
-			GString *label = g_string_new("");
 			GSList *open_menus = NULL;
 			GList *l;
 
@@ -407,7 +406,6 @@ ecalp_standard_menu_factory (EPopup *ecalp, void *data)
 			if (open_menus)
 				e_popup_add_items(ecalp, open_menus, NULL, ecalp_apps_popup_free, NULL);
 
-			g_string_free(label, TRUE);
 			g_list_free(apps);
 		}
 	}
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index ad017e534d..33f001e8c3 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1255,7 +1255,7 @@ static void
 on_new_task (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	ECalendarTable *cal_table = data;
-	ETasks *tasks = g_object_get_data (cal_table, "tasks");
+	ETasks *tasks = g_object_get_data (G_OBJECT (cal_table), "tasks");
 
 	if (!tasks)
 		return;
diff --git a/calendar/gui/e-day-view-config.c b/calendar/gui/e-day-view-config.c
index c5fe53e293..c11a675802 100644
--- a/calendar/gui/e-day-view-config.c
+++ b/calendar/gui/e-day-view-config.c
@@ -394,7 +394,8 @@ void
 e_day_view_config_set_view (EDayViewConfig *view_config, EDayView *day_view) 
 {
 	EDayViewConfigPrivate *priv;
-	guint not, not_1, not_2;
+	gint not_1, not_2, mbnot;
+	guint not;
 	GList *l;
 	
 	g_return_if_fail (view_config != NULL);
@@ -476,8 +477,8 @@ e_day_view_config_set_view (EDayViewConfig *view_config, EDayView *day_view)
 	/* Showing Marcus Bains Line */
 	set_marcus_bains (day_view);
 
-	calendar_config_add_notification_marcus_bains (marcus_bains_changed_cb, view_config, &not, &not_1, &not_2);
-	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not));
+	calendar_config_add_notification_marcus_bains (marcus_bains_changed_cb, view_config, &mbnot, &not_1, &not_2);
+	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (mbnot));
 	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not_1));
 	priv->notifications = g_list_prepend (priv->notifications, GUINT_TO_POINTER (not_2));
 
diff --git a/calendar/gui/e-day-view-main-item.c b/calendar/gui/e-day-view-main-item.c
index 6b818d3d66..50a3faf799 100644
--- a/calendar/gui/e-day-view-main-item.c
+++ b/calendar/gui/e-day-view-main-item.c
@@ -1271,7 +1271,7 @@ e_day_view_main_item_draw_day_event (EDayViewMainItem *dvmitem,
 	gint end_hour, end_display_hour, end_minute, end_suffix_width;
 	gboolean show_span = FALSE, format_time;
 	gint offset, interval;
-	char *text, *start_suffix, *end_suffix;
+	char *text = NULL, *start_suffix, *end_suffix;
 	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 2bd1bc9e41..88dc12c44d 100644
--- a/calendar/gui/e-day-view-time-item.c
+++ b/calendar/gui/e-day-view-time-item.c
@@ -178,7 +178,6 @@ e_day_view_time_item_get_column_width (EDayViewTimeItem *dvtmitem)
 	gint digit, large_digit_width, max_large_digit_width = 0;
 	gint max_suffix_width, max_minute_or_suffix_width;
 	gint column_width_default, column_width_60_min_rows;
-	cairo_t *cr;
 
 	day_view = dvtmitem->day_view;
 	g_return_val_if_fail (day_view != NULL, 0);
diff --git a/calendar/gui/e-day-view.c b/calendar/gui/e-day-view.c
index b5c5a3b30f..cb10faac3f 100644
--- a/calendar/gui/e-day-view.c
+++ b/calendar/gui/e-day-view.c
@@ -2475,11 +2475,11 @@ e_day_view_update_event_label (EDayView *day_view,
 
 	if ((interval/day_view->mins_per_row) >= 2) 
 		short_event = FALSE;
-	else if ((interval%day_view->mins_per_row)==0)
+	else if ((interval%day_view->mins_per_row)==0) {
 		if (((event->end_minute%day_view->mins_per_row)==0) || ((event->start_minute%day_view->mins_per_row)==0)){
 			short_event = TRUE;	
 		}
-	else
+	} else
 		short_event = FALSE;
 
 	if (!editing_event) {
@@ -7155,7 +7155,7 @@ e_day_view_on_text_item_event (GnomeCanvasItem *item,
 			pevent->y = ((GdkEventCrossing *)event)->y_root;
 			pevent->tooltip = NULL;
 
-			data->cal_view = day_view;
+			data->cal_view = (ECalendarView *)day_view;
 			data->day = day;
 			data->event_num = event_num;
 			data->get_view_event = tooltip_get_view_event;
diff --git a/calendar/gui/e-meeting-list-view.c b/calendar/gui/e-meeting-list-view.c
index ed50c0bb9a..2e632c6919 100644
--- a/calendar/gui/e-meeting-list-view.c
+++ b/calendar/gui/e-meeting-list-view.c
@@ -287,7 +287,7 @@ e_meeting_list_view_remove_attendee_from_name_selector (EMeetingListView *view,
 		if (e_destination_is_evolution_list (des)) {
 			GList *l, *dl;
 
-			dl = e_destination_list_get_dests (des);
+			dl = (GList *)e_destination_list_get_dests (des);
 
 			for (l = dl; l; l = l->next) {
 				attendee = e_destination_get_email (l->data);
@@ -335,7 +335,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 				continue;
 			
 			attendee = e_meeting_store_add_attendee_with_defaults (model);
-			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", l->data));
+			e_meeting_attendee_set_address (attendee, g_strdup_printf ("MAILTO:%s", (char *)l->data));
 			e_meeting_attendee_set_cn (attendee, g_strdup (m->data));
 			if (existing_attendee) {
 				/* FIXME Should we copy anything else? */
@@ -343,7 +343,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 				e_meeting_attendee_set_role (attendee, e_meeting_attendee_get_role (existing_attendee));
 				e_meeting_attendee_set_rsvp (attendee, e_meeting_attendee_get_rsvp (existing_attendee));
 				e_meeting_attendee_set_status (attendee, e_meeting_attendee_get_status (existing_attendee));
-				e_meeting_attendee_set_delfrom (attendee, e_meeting_attendee_get_delfrom (existing_attendee));
+				e_meeting_attendee_set_delfrom (attendee, (gchar *)e_meeting_attendee_get_delfrom (existing_attendee));
 			}
 			e_meeting_list_view_add_attendee_to_name_selector (E_MEETING_LIST_VIEW (view), attendee);
 		}
@@ -367,7 +367,7 @@ attendee_edited_cb (GtkCellRenderer *renderer, const gchar *path, GList *address
 				e_meeting_store_remove_attendee (model, existing_attendee);
 			}
 		} else {
-			EMeetingAttendee *attendee = e_meeting_attendee_new ();
+			EMeetingAttendee *attendee = E_MEETING_ATTENDEE (e_meeting_attendee_new ());
 
 			if (existing_attendee)
 				e_meeting_list_view_remove_attendee_from_name_selector (E_MEETING_LIST_VIEW (view),
@@ -568,7 +568,6 @@ row_activated_cb (GtkTreeSelection *selection, EMeetingListView *view)
 {
        EMeetingAttendee *existing_attendee;
        EMeetingListViewPrivate *priv;
-       GtkTreeIter iter;
        int row;
        EMeetingAttendeeEditLevel el;
        gint  edit_level;
@@ -804,7 +803,7 @@ add_to_list (gpointer data, gpointer u_data)
 {
 	GSList **user_data = u_data;
 
-	*user_data = g_slist_append (*user_data, itip_strip_mailto (e_meeting_attendee_get_address (data)));
+	*user_data = g_slist_append (*user_data, (gpointer)itip_strip_mailto (e_meeting_attendee_get_address (data)));
 }
 
 static void
diff --git a/calendar/gui/e-meeting-store.c b/calendar/gui/e-meeting-store.c
index 738447b83b..ae06d037fc 100644
--- a/calendar/gui/e-meeting-store.c
+++ b/calendar/gui/e-meeting-store.c
@@ -1472,7 +1472,7 @@ e_meeting_store_refresh_busy_periods (EMeetingStore *store,
 guint
 e_meeting_store_get_num_queries (EMeetingStore *store)
 {
-	g_return_if_fail (E_IS_MEETING_STORE (store));
+	g_return_val_if_fail (E_IS_MEETING_STORE (store), 0);
 
 	return store->priv->num_queries;
 }
diff --git a/calendar/gui/e-tasks.c b/calendar/gui/e-tasks.c
index adfef2b564..0c533adc75 100644
--- a/calendar/gui/e-tasks.c
+++ b/calendar/gui/e-tasks.c
@@ -559,7 +559,7 @@ setup_widgets (ETasks *tasks)
 
 	/* create the task list */
 	priv->tasks_view = e_calendar_table_new ();
-	g_object_set_data (priv->tasks_view, "tasks", tasks);
+	g_object_set_data (G_OBJECT (priv->tasks_view), "tasks", tasks);
 	priv->tasks_view_config = e_calendar_table_config_new (E_CALENDAR_TABLE (priv->tasks_view));
 	
 	g_signal_connect (priv->tasks_view, "user_created", G_CALLBACK (user_created_cb), tasks);
diff --git a/calendar/gui/e-week-view.c b/calendar/gui/e-week-view.c
index f8fc86d1ad..50b3e4eb4d 100644
--- a/calendar/gui/e-week-view.c
+++ b/calendar/gui/e-week-view.c
@@ -2587,7 +2587,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
 			pevent->y = ((GdkEventCrossing *)event)->y_root;
 			pevent->tooltip = NULL;			
 
-			data->cal_view = view;
+			data->cal_view = (ECalendarView *)view;
 			data->day = -1;
 			data->event_num = event_num;
 			data->get_view_event = tooltip_get_view_event;
@@ -3160,7 +3160,7 @@ e_week_view_on_text_item_event (GnomeCanvasItem *item,
 		pevent->y = ((GdkEventCrossing *)gdkevent)->y_root;
 		pevent->tooltip = NULL;
 
-		data->cal_view = week_view;
+		data->cal_view = (ECalendarView *)week_view;
 		data->day = -1;
 		data->event_num = nevent;
 		data->get_view_event = tooltip_get_view_event;
diff --git a/calendar/gui/gnome-cal.c b/calendar/gui/gnome-cal.c
index ec33b07be9..f0f240c172 100644
--- a/calendar/gui/gnome-cal.c
+++ b/calendar/gui/gnome-cal.c
@@ -1427,7 +1427,7 @@ view_done_cb (ECalModel *model, ECalendarStatus status, ECalSourceType type, Gno
 GtkWidget * 
 gnome_calendar_get_tag (GnomeCalendar *gcal)
 {
-	return gcal->priv->date_navigator;
+	return GTK_WIDGET (gcal->priv->date_navigator);
 }
 
 static void
@@ -3444,7 +3444,7 @@ gnome_calendar_cut_clipboard (GnomeCalendar *gcal)
 	} else if (location == FOCUS_TASKPAD)
 		e_calendar_table_cut_clipboard (E_CALENDAR_TABLE (priv->todo));
 	else if (location == FOCUS_MEMOPAD)
-		e_calendar_table_copy_clipboard (E_MEMO_TABLE (priv->memo));
+		e_memo_table_cut_clipboard (E_MEMO_TABLE (priv->memo));
 }
 
 void
@@ -3462,7 +3462,7 @@ gnome_calendar_copy_clipboard (GnomeCalendar *gcal)
 	} else if (location == FOCUS_TASKPAD)
 		e_calendar_table_copy_clipboard (E_CALENDAR_TABLE (priv->todo));
 	else if (location == FOCUS_MEMOPAD)
-		e_calendar_table_copy_clipboard (E_MEMO_TABLE (priv->memo));
+		e_memo_table_copy_clipboard (E_MEMO_TABLE (priv->memo));
 }
 
 void
diff --git a/calendar/gui/gnome-cal.h b/calendar/gui/gnome-cal.h
index fc4fcd5847..08ea702cb2 100644
--- a/calendar/gui/gnome-cal.h
+++ b/calendar/gui/gnome-cal.h
@@ -138,6 +138,7 @@ ECalendarTable *gnome_calendar_get_task_pad	(GnomeCalendar *gcal);
 GtkWidget *gnome_calendar_get_e_calendar_widget (GnomeCalendar *gcal); 
 GtkWidget *gnome_calendar_get_search_bar_widget (GnomeCalendar *gcal);
 GtkWidget *gnome_calendar_get_view_notebook_widget (GnomeCalendar *gcal);
+GtkWidget *gnome_calendar_get_tag (GnomeCalendar *gcal);
 
 struct _ECalMenu *gnome_calendar_get_taskpad_menu (GnomeCalendar *gcal);
 struct _ECalMenu *gnome_calendar_get_calendar_menu (GnomeCalendar *gcal);
diff --git a/calendar/gui/itip-utils.c b/calendar/gui/itip-utils.c
index d522d58de1..aa77f91284 100644
--- a/calendar/gui/itip-utils.c
+++ b/calendar/gui/itip-utils.c
@@ -603,16 +603,18 @@ comp_to_list (ECalComponentItipMethod method, ECalComponent *comp, GList *users,
 		break;
 	case E_CAL_COMPONENT_METHOD_PUBLISH:
 		if(users) {
+			GList *list;
+
 			len = g_list_length (users);
 			to_list = GNOME_Evolution_Composer_RecipientList__alloc ();
 			to_list->_maximum = len;
 			to_list->_length = 0;
 			to_list->_buffer = CORBA_sequence_GNOME_Evolution_Composer_Recipient_allocbuf (len);
 			
-			for (l = users; l != NULL; l = l->next) {
+			for (list = users; list != NULL; list = list->next) {
 				recipient = &(to_list->_buffer[to_list->_length]);
 				recipient->name = CORBA_string_dup ("");
-				recipient->address = CORBA_string_dup (l->data);
+				recipient->address = CORBA_string_dup (list->data);
 				to_list->_length++;
 			}
 
diff --git a/calendar/gui/memos-component.c b/calendar/gui/memos-component.c
index 25a4bd4559..81d3208cd2 100644
--- a/calendar/gui/memos-component.c
+++ b/calendar/gui/memos-component.c
@@ -518,7 +518,7 @@ source_removed_cb (EMemos *memos, ESource *source, MemosComponentView *component
 static void
 set_info (MemosComponentView *component_view)
 {
-	GString *message = g_string_new ("");
+	GString *message = g_string_new (NULL);
 	int rows, selected_rows;
 	
 	rows = e_table_model_row_count (component_view->model);
diff --git a/calendar/gui/migration.c b/calendar/gui/migration.c
index 8bac76992f..feffff101f 100644
--- a/calendar/gui/migration.c
+++ b/calendar/gui/migration.c
@@ -248,7 +248,7 @@ get_source_name (ESourceGroup *group, const char *path)
 	int i, j, starting_index;
 	int num_elements;
 	gboolean conflict;
-	GString *s = g_string_new ("");
+	GString *s = g_string_new (NULL);
 
 	for (i = 0; p[i]; i ++) ;
 
@@ -260,7 +260,6 @@ get_source_name (ESourceGroup *group, const char *path)
 	/* check if it conflicts */
 	starting_index = i;
 	do {
-		g_string_assign (s, "");
 		for (j = starting_index; j < num_elements; j += 2) {
 			if (j != starting_index)
 				g_string_append_c (s, '_');
diff --git a/calendar/gui/tasks-component.c b/calendar/gui/tasks-component.c
index 35ddd3b0bd..1ecdba1811 100644
--- a/calendar/gui/tasks-component.c
+++ b/calendar/gui/tasks-component.c
@@ -508,7 +508,7 @@ source_removed_cb (ETasks *tasks, ESource *source, TasksComponentView *component
 static void
 set_info (TasksComponentView *component_view)
 {
-	GString *message = g_string_new ("");
+	GString *message = g_string_new (NULL);
 	int rows, selected_rows;
 	
 	rows = e_table_model_row_count (component_view->model);