? calendar.error
? warnings
? conduits/memo/Makefile
? conduits/memo/Makefile.in
? gui/apps_evolution_calendar-2.6.schemas
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.2925
diff -u -p -r1.2925 ChangeLog
--- ChangeLog	8 Jan 2006 21:23:06 -0000	1.2925
+++ ChangeLog	9 Jan 2006 10:27:37 -0000
@@ -1,3 +1,164 @@
+2006-01-09  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* gui/alarm-notify/alarm-notify-dialog.c:
+	(add_alarm_to_notified_alarms_dialog):
+	* gui/alarm-notify/alarm-queue.c: (remove_queued_alarm),
+	(open_alarm_dialog), (menu_item_toggle_callback), (populate):
+	* gui/alarm-notify/alarm.c: (pop_alarm), (alarm_remove):
+	* gui/alarm-notify/config-data.c:
+	(config_data_replace_string_list):
+	* gui/cal-search-bar.c: (regen_query):
+	* gui/calendar-view-factory.c:
+	* gui/calendar-view.c:
+	* gui/comp-editor-factory.c: (edit_existing),
+	(resolve_pending_requests), (impl_editExisting), (impl_editNew):
+	* gui/control-factory.c:
+	* gui/dialogs/cal-attachment-select-file.c:
+	(comp_editor_select_file_attachments):
+	* gui/dialogs/calendar-setup.c: (eccp_get_source_type):
+	* gui/dialogs/comp-editor.c: (comp_editor_class_init),
+	(commit_all_fields), (delete_event_cb), (editor_key_press_event),
+	(menu_file_save_cb), (menu_file_close_cb), (make_icon_from_comp),
+	(comp_editor_focus), (needs_send_cb):
+	* gui/dialogs/delete-comp.c: (delete_component_dialog):
+	* gui/dialogs/e-delegate-dialog.c:
+	* gui/dialogs/event-editor.c:
+	* gui/dialogs/event-page.c: (event_page_fill_widgets),
+	(popup_delete_cb), (list_key_press):
+	* gui/dialogs/meeting-page.c: (remove_clicked_cb),
+	(popup_delete_cb), (button_press_event), (list_key_press),
+	(meeting_page_construct):
+	* gui/dialogs/memo-editor.c: (init_widgets),
+	(memo_editor_set_e_cal), (memo_editor_edit_comp),
+	(memo_editor_send_comp):
+	* gui/dialogs/memo-page.c:
+	* gui/dialogs/recurrence-page.c: (fill_exception_widgets),
+	(exception_add_cb):
+	* gui/dialogs/schedule-page.c: (clear_widgets),
+	(schedule_page_fill_component):
+	* gui/dialogs/task-details-page.c:
+	(task_details_page_fill_timezones), (complete_date_changed):
+	* gui/dialogs/task-editor.c:
+	* gui/dialogs/task-page.c: (task_page_fill_widgets),
+	(popup_delete_cb), (list_key_press):
+	* gui/e-alarm-list.c: (get_alarm_string):
+	* gui/e-cal-component-memo-preview.c: (write_html):
+	* gui/e-cal-component-preview.c: (write_html):
+	* gui/e-cal-list-view-config.c:
+	(e_cal_list_view_config_set_property),
+	(e_cal_list_view_config_get_property),
+	(e_cal_list_view_config_dispose):
+	* gui/e-cal-list-view.c:
+	* gui/e-cal-model-calendar.c: (ecmc_value_at):
+	* gui/e-cal-model-memos.c: (ecmm_value_at):
+	* gui/e-cal-model-tasks.c: (get_due_status), (ecmt_value_at),
+	(ecmt_set_value_at), (ecmt_is_cell_editable),
+	(ecmt_value_is_empty), (e_cal_model_tasks_mark_task_complete),
+	(e_cal_model_tasks_update_due_tasks):
+	* gui/e-cal-model.c: (get_classification),
+	(ecm_get_color_for_component), (e_cal_model_set_default_client),
+	(e_cal_view_objects_modified_cb), (e_cal_model_add_client),
+	(e_cal_model_remove_client), (e_cal_model_set_instance_times):
+	* gui/e-cal-popup.c: (ecalp_part_popup_saveas):
+	* gui/e-calendar-table-config.c:
+	(e_calendar_table_config_set_property),
+	(e_calendar_table_config_get_property),
+	(e_calendar_table_config_dispose):
+	* gui/e-calendar-table.c: (e_calendar_table_class_init):
+	* gui/e-calendar-table.h:
+	* gui/e-calendar-view.c: (e_calendar_view_set_property),
+	(e_calendar_view_get_property), (open_event_with_flags),
+	(e_calendar_view_get_tooltips):
+	* gui/e-cell-date-edit-config.c:
+	(e_cell_date_edit_config_set_property),
+	(e_cell_date_edit_config_get_property),
+	(e_cell_date_edit_config_dispose):
+	* gui/e-cell-date-edit-text.c:
+	* gui/e-comp-editor-registry.c:
+	* gui/e-date-edit-config.c: (e_date_edit_config_set_property),
+	(e_date_edit_config_get_property), (e_date_edit_config_dispose):
+	* gui/e-day-view-config.c: (e_day_view_config_set_property),
+	(e_day_view_config_get_property), (e_day_view_config_dispose):
+	* gui/e-day-view-main-item.c: (e_day_view_main_item_set_arg),
+	(e_day_view_main_item_draw_day_event),
+	(e_day_view_main_item_event):
+	* gui/e-day-view-time-item.c: (e_day_view_time_item_set_arg),
+	(e_day_view_time_item_get_column_width):
+	* gui/e-day-view-top-item.c: (e_day_view_top_item_set_arg),
+	(e_day_view_top_item_draw_long_event),
+	(e_day_view_top_item_draw_triangle), (e_day_view_top_item_event):
+	* gui/e-day-view.c: (process_component), (e_day_view_style_set),
+	(e_day_view_recalc_cell_sizes), (e_day_view_foreach_event),
+	(e_day_view_reshape_resize_long_event_rect_item),
+	(e_day_view_update_long_event_resize), (e_day_view_update_resize),
+	(e_day_view_reshape_long_event), (e_day_view_reshape_day_event),
+	(e_day_view_change_duration_to_start_of_work_day),
+	(tooltip_destroy), (e_day_view_on_text_item_event),
+	(e_day_view_on_editing_stopped):
+	* gui/e-itip-control.c: (e_itip_control_class_init),
+	(find_cal_opened_cb), (find_server), (set_date_label),
+	(ok_clicked_cb):
+	* gui/e-meeting-attendee.c:
+	* gui/e-meeting-list-view.c:
+	(e_meeting_list_view_remove_attendee_from_name_selector):
+	* gui/e-meeting-store.c: (role_to_text), (partstat_to_text),
+	(e_meeting_store_set_value):
+	* gui/e-meeting-time-sel-item.c:
+	(e_meeting_time_selector_item_set_arg),
+	(e_meeting_time_selector_item_paint_all_attendees_busy_periods):
+	* gui/e-meeting-time-sel.c: (e_meeting_time_selector_construct),
+	(e_meeting_time_selector_recalc_date_format):
+	* gui/e-memo-table-config.c: (e_memo_table_config_set_property),
+	(e_memo_table_config_get_property), (e_memo_table_config_dispose):
+	* gui/e-memo-table.c: (e_memo_table_class_init), (task_compare_cb):
+	* gui/e-memos.c: (update_view), (backend_error_cb), (open_ecal):
+	* gui/e-mini-calendar-config.c:
+	(e_mini_calendar_config_set_property),
+	(e_mini_calendar_config_get_property),
+	(e_mini_calendar_config_dispose):
+	* gui/e-pub-utils.c: (is_publish_time), (e_pub_publish):
+	* gui/e-tasks.c: (process_completed_tasks), (backend_error_cb):
+	* gui/e-timezone-entry.c: (e_timezone_entry_destroy):
+	* gui/e-week-view-config.c: (e_week_view_config_set_property),
+	(e_week_view_config_get_property), (e_week_view_config_dispose):
+	* gui/e-week-view-event-item.c: (e_week_view_event_item_draw),
+	(e_week_view_event_item_draw_icons):
+	* gui/e-week-view-main-item.c: (e_week_view_main_item_set_arg):
+	* gui/e-week-view-titles-item.c: (e_week_view_titles_item_set_arg),
+	(e_week_view_titles_item_draw):
+	* gui/e-week-view.c: (process_component), (tooltip_destroy),
+	(tooltip_event_cb), (e_week_view_reshape_event_span),
+	(e_week_view_on_text_item_event), (e_week_view_event_move),
+	(e_week_view_on_editing_stopped), (e_week_view_do_key_press):
+	* gui/gnome-cal.c: (dn_e_cal_view_objects_modified_cb),
+	(dn_e_cal_view_done_cb), (table_selection_change_cb),
+	(gnome_calendar_goto), (focus_current_view), (backend_error_cb),
+	(gnome_calendar_set_selected_time_range),
+	(gnome_calendar_get_current_time_range),
+	(gnome_calendar_get_visible_time_range),
+	(gnome_calendar_delete_selected_occurrence):
+	* gui/goto.c: (goto_dialog):
+	* gui/itip-utils.c: (comp_fb_normalize):
+	* gui/memos-component.c: (create_new_memo),
+	(impl_requestCreateItem):
+	* gui/migration.c: (migrate_memos):
+	* gui/print.c: (print_month_small), (print_day_details),
+	(print_todo_details), (print_comp_item):
+	* gui/tasks-component.c: (create_new_todo),
+	(impl_requestCreateItem):
+	* gui/weekday-picker.c: Cleanups:
+	- remove unused vars
+	- remove extraneous semi-colons
+	- add some comments where assignments were done without using
+	  the results later
+	- remove break; statements after return foo;
+	- add casts in some places to be more type correct
+	- rename variables with name clashes
+	- s/if/ifdef in some cases
+	- mark some code static
+	- remove some unused functions
+	- use guint for 1-bit bitfields
+
 2006-01-08  Tor Lillqvist  <tml@novell.com>
 
 	* gui/migration.c: Bypass most of this file on Win32, as there are
Index: gui/cal-search-bar.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/cal-search-bar.c,v
retrieving revision 1.25
diff -u -p -r1.25 cal-search-bar.c
--- gui/cal-search-bar.c	20 Dec 2005 09:47:56 -0000	1.25
+++ gui/cal-search-bar.c	9 Jan 2006 10:27:37 -0000
@@ -77,7 +77,7 @@ enum {
 
 static guint cal_search_bar_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (CalSearchBar, cal_search_bar, E_SEARCH_BAR_TYPE);
+G_DEFINE_TYPE (CalSearchBar, cal_search_bar, E_SEARCH_BAR_TYPE)
 
 /* Class initialization function for the calendar search bar */
 static void
@@ -268,11 +268,8 @@ notify_category_is (CalSearchBar *cal_se
 static void
 regen_query (CalSearchBar *cal_search)
 {
-	CalSearchBarPrivate *priv;
 	int id;
 	const char *category;
-
-	priv = cal_search->priv;
 
 	/* Fetch the data from the ESearchBar's entry widgets */
 
Index: gui/calendar-view-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-view-factory.c,v
retrieving revision 1.10
diff -u -p -r1.10 calendar-view-factory.c
--- gui/calendar-view-factory.c	14 Oct 2004 15:02:32 -0000	1.10
+++ gui/calendar-view-factory.c	9 Jan 2006 10:27:37 -0000
@@ -43,7 +43,7 @@ static const char *calendar_view_factory
 static const char *calendar_view_factory_get_type_code (GalViewFactory *factory);
 static GalView *calendar_view_factory_new_view (GalViewFactory *factory, const char *name);
 
-G_DEFINE_TYPE (CalendarViewFactory, calendar_view_factory, GAL_VIEW_FACTORY_TYPE);
+G_DEFINE_TYPE (CalendarViewFactory, calendar_view_factory, GAL_VIEW_FACTORY_TYPE)
 
 /* Class initialization function for the calendar view factory */
 static void
Index: gui/calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/calendar-view.c,v
retrieving revision 1.10
diff -u -p -r1.10 calendar-view.c
--- gui/calendar-view.c	23 Mar 2005 14:54:04 -0000	1.10
+++ gui/calendar-view.c	9 Jan 2006 10:27:37 -0000
@@ -46,7 +46,7 @@ static void calendar_view_set_title (Gal
 static const char *calendar_view_get_type_code (GalView *view);
 static GalView *calendar_view_clone (GalView *view);
 
-G_DEFINE_TYPE (CalendarView, calendar_view, GAL_VIEW_TYPE);
+G_DEFINE_TYPE (CalendarView, calendar_view, GAL_VIEW_TYPE)
 
 /* Class initialization function for the calendar view */
 static void
Index: gui/comp-editor-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/comp-editor-factory.c,v
retrieving revision 1.45
diff -u -p -r1.45 comp-editor-factory.c
--- gui/comp-editor-factory.c	29 Sep 2005 13:02:55 -0000	1.45
+++ gui/comp-editor-factory.c	9 Jan 2006 10:27:37 -0000
@@ -111,7 +111,7 @@ static BonoboObjectClass *parent_class =
 BONOBO_TYPE_FUNC_FULL (CompEditorFactory,
 		       GNOME_Evolution_Calendar_CompEditorFactory,
 		       BONOBO_OBJECT_TYPE,
-		       comp_editor_factory);
+		       comp_editor_factory)
 
 /* Class initialization function for the component editor factory */
 static void
@@ -245,6 +245,7 @@ edit_existing (OpenClient *oc, const cha
 	icalcomponent *icalcomp;
 	CompEditor *editor;
 	ECalComponentVType vtype;
+	/* flags is not initialized before it's used */
 	CompEditorFlags flags;
 
 	g_assert (oc->open);
@@ -353,14 +354,9 @@ edit_new (OpenClient *oc, const GNOME_Ev
 static void
 resolve_pending_requests (OpenClient *oc)
 {
-	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
 	GSList *l;
 	icaltimezone *zone;
 
-	factory = oc->factory;
-	priv = factory->priv;
-
 	if (!oc->pending)
 		return;
 
@@ -554,13 +550,11 @@ impl_editExisting (PortableServer_Servan
 		   CORBA_Environment *ev)
 {
 	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
 	OpenClient *oc;
 	CompEditor *editor;
 	ECalSourceType source_type;
 	
 	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
 
 	switch (corba_type) {
 	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
@@ -611,12 +605,10 @@ impl_editNew (PortableServer_Servant ser
 	      CORBA_Environment *ev)
 {
 	CompEditorFactory *factory;
-	CompEditorFactoryPrivate *priv;
 	OpenClient *oc;
 	ECalSourceType source_type;
 	
 	factory = COMP_EDITOR_FACTORY (bonobo_object_from_servant (servant));
-	priv = factory->priv;
 
 	switch (corba_type) {
 	case GNOME_Evolution_Calendar_CompEditorFactory_EDITOR_MODE_TODO:
Index: gui/control-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/control-factory.c,v
retrieving revision 1.47
diff -u -p -r1.47 control-factory.c
--- gui/control-factory.c	11 May 2004 19:29:04 -0000	1.47
+++ gui/control-factory.c	9 Jan 2006 10:27:37 -0000
@@ -38,6 +38,7 @@
 
 #include "control-factory.h"
 
+/* Are these supposed to be global or static? */
 CORBA_Environment ev;
 CORBA_ORB orb;
 
Index: gui/e-alarm-list.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-alarm-list.c,v
retrieving revision 1.13
diff -u -p -r1.13 e-alarm-list.c
--- gui/e-alarm-list.c	7 Jan 2006 02:02:08 -0000	1.13
+++ gui/e-alarm-list.c	9 Jan 2006 10:27:37 -0000
@@ -436,10 +436,7 @@ get_alarm_string (ECalComponentAlarm *al
 {
 	ECalComponentAlarmAction action;
 	ECalComponentAlarmTrigger trigger;
-	char string[256];
 	char *base, *str = NULL, *dur;
-
-	string [0] = '\0';
 
 	e_cal_component_alarm_get_action (alarm, &action);
 	e_cal_component_alarm_get_trigger (alarm, &trigger);
Index: gui/e-cal-component-memo-preview.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-component-memo-preview.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-cal-component-memo-preview.c
--- gui/e-cal-component-memo-preview.c	17 Dec 2005 12:21:43 -0000	1.3
+++ gui/e-cal-component-memo-preview.c	9 Jan 2006 10:27:37 -0000
@@ -45,7 +45,7 @@ struct _ECalComponentMemoPreviewPrivate 
 	icaltimezone *zone;
 };
 
-G_DEFINE_TYPE (ECalComponentMemoPreview, e_cal_component_memo_preview, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (ECalComponentMemoPreview, e_cal_component_memo_preview, GTK_TYPE_TABLE)
 
 
 static void
@@ -100,47 +100,12 @@ url_requested_cb (GtkHTML *html, const c
 	}
 }
 
-/* Converts a time_t to a string, relative to the specified timezone */
-static char *
-timet_to_str_with_zone (ECalComponentDateTime *dt, ECal *ecal, icaltimezone *default_zone)
-{
-	struct icaltimetype itt;
-	icaltimezone *zone;
-        struct tm tm;
-        char buf[256];                                                                                              
-
-	if (dt->tzid) {
-		/* If we can't find the zone, we'll guess its "local" */
-		if (!e_cal_get_timezone (ecal, dt->tzid, &zone, NULL))
-			zone = NULL;
-	} else if (dt->value->is_utc) {
-		zone = icaltimezone_get_utc_timezone ();
-	} else {
-		zone = NULL;
-	}
-	
-	
-	itt = *dt->value;
-	if (zone)
-		icaltimezone_convert_time (&itt, zone, default_zone);
-        tm = icaltimetype_to_tm (&itt);
-                                                                                              
-        e_time_format_date_and_time (&tm, calendar_config_get_24_hour_format (),
-                                     FALSE, FALSE, buf, sizeof (buf));
-
-	return g_locale_to_utf8 (buf, -1, NULL, NULL, NULL);
-}
-
 static void
 write_html (GtkHTMLStream *stream, ECal *ecal, ECalComponent *comp, icaltimezone *default_zone)
 {
 	ECalComponentText text;
-	ECalComponentDateTime dt;
 	gchar *str;
 	GSList *l;
-	icalproperty_status status;
-	const char *location;
-	int *priority_value;
 	gboolean one_added = FALSE;
 
 	g_return_if_fail (E_IS_CAL_COMPONENT (comp));
@@ -152,7 +117,7 @@ write_html (GtkHTMLStream *stream, ECal 
 	e_cal_component_get_categories_list (comp, &l);
 	if (l) {
 		GSList *node;
-		GString *str = g_string_new ("");
+		GString *string = g_string_new ("");
 		
 		
 		gtk_html_stream_printf(stream, "<H3>Categories: ");
@@ -170,16 +135,16 @@ write_html (GtkHTMLStream *stream, ECal 
 			}
 			else{
 				if(one_added == FALSE){
-					g_string_append_printf (str, "%s", (const char *) node->data);
+					g_string_append_printf (string, "%s", (const char *) node->data);
 					one_added = TRUE;
 				}
 				else{
-					g_string_append_printf (str, ", %s", (const char *) node->data);
+					g_string_append_printf (string, ", %s", (const char *) node->data);
 				}
 			}
 		}
 		
-		gtk_html_stream_printf(stream, str->str);
+		gtk_html_stream_printf(stream, string->str);
 		
 		gtk_html_stream_printf(stream, "</H3>");
 
@@ -204,23 +169,23 @@ write_html (GtkHTMLStream *stream, ECal 
 
 		for (node = l; node != NULL; node = node->next) {
 			gint i, j;
-			GString *str = g_string_new ("");
+			GString *string = g_string_new ("");
 
 			text = * (ECalComponentText *) node->data;
 			for (i = 0, j=0; i < strlen (text.value ? text.value : 0); i++, j++) {
 				if (text.value[i] == '\n'){
-					str = g_string_append (str, "<BR>");
+					string = g_string_append (string, "<BR>");
 				}
 				else if (text.value[i] == '<')
-					str = g_string_append (str, "&lt;");
+					string = g_string_append (string, "&lt;");
 				else if (text.value[i] == '>')
-					str = g_string_append (str, "&gt;");
+					string = g_string_append (string, "&gt;");
 				else
-					str = g_string_append_c (str, text.value[i]);
+					string = g_string_append_c (string, text.value[i]);
 			}
 
-			gtk_html_stream_printf (stream, str->str);
-			g_string_free (str, TRUE);
+			gtk_html_stream_printf (stream, string->str);
+			g_string_free (string, TRUE);
 		}
 
 		gtk_html_stream_printf (stream, "</TD></TR>");
Index: gui/e-cal-component-preview.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-component-preview.c,v
retrieving revision 1.7
diff -u -p -r1.7 e-cal-component-preview.c
--- gui/e-cal-component-preview.c	6 Jan 2006 15:08:37 -0000	1.7
+++ gui/e-cal-component-preview.c	9 Jan 2006 10:27:37 -0000
@@ -44,7 +44,7 @@ struct _ECalComponentPreviewPrivate {
 	icaltimezone *zone;
 };
 
-G_DEFINE_TYPE (ECalComponentPreview, e_cal_component_preview, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (ECalComponentPreview, e_cal_component_preview, GTK_TYPE_TABLE)
 
 static void
 on_link_clicked (GtkHTML *html, const char *url, gpointer data)
@@ -272,22 +272,22 @@ write_html (GtkHTMLStream *stream, ECal 
 
 		for (node = l; node != NULL; node = node->next) {
 			gint i;
-			GString *str = g_string_new ("");;
+			GString *string = g_string_new ("");;
 
 			text = * (ECalComponentText *) node->data;
 			for (i = 0; i < strlen (text.value ? text.value : 0); i++) {
 				if (text.value[i] == '\n')
-					str = g_string_append (str, "<BR>");
+					string = g_string_append (string, "<BR>");
 				else if (text.value[i] == '<')
-					str = g_string_append (str, "&lt;");
+					string = g_string_append (string, "&lt;");
 				else if (text.value[i] == '>')
-					str = g_string_append (str, "&gt;");
+					string = g_string_append (string, "&gt;");
 				else
-					str = g_string_append_c (str, text.value[i]);
+					string = g_string_append_c (string, text.value[i]);
 			}
 
-			gtk_html_stream_printf (stream, "%s", str->str);
-			g_string_free (str, TRUE);
+			gtk_html_stream_printf (stream, "%s", string->str);
+			g_string_free (string, TRUE);
 		}
 
 		gtk_html_stream_printf (stream, "</TD></TR>");
Index: gui/e-cal-list-view-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-list-view-config.c,v
retrieving revision 1.5
diff -u -p -r1.5 e-cal-list-view-config.c
--- gui/e-cal-list-view-config.c	14 Oct 2004 15:22:32 -0000	1.5
+++ gui/e-cal-list-view-config.c	9 Jan 2006 10:27:37 -0000
@@ -36,16 +36,14 @@ enum props {
 	PROP_VIEW,
 };
 
-G_DEFINE_TYPE (ECalListViewConfig, e_cal_list_view_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ECalListViewConfig, e_cal_list_view_config, G_TYPE_OBJECT)
 
 static void
 e_cal_list_view_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	ECalListViewConfig *view_config;
-	ECalListViewConfigPrivate *priv;
 
 	view_config = E_CAL_LIST_VIEW_CONFIG (object);
-	priv = view_config->priv;
 	
 	switch (property_id) {
 	case PROP_VIEW:
@@ -61,10 +59,8 @@ static void
 e_cal_list_view_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	ECalListViewConfig *view_config;
-	ECalListViewConfigPrivate *priv;
 
 	view_config = E_CAL_LIST_VIEW_CONFIG (object);
-	priv = view_config->priv;
 	
 	switch (property_id) {
 	case PROP_VIEW:
@@ -80,10 +76,7 @@ static void
 e_cal_list_view_config_dispose (GObject *object)
 {
 	ECalListViewConfig *view_config = E_CAL_LIST_VIEW_CONFIG (object);
-	ECalListViewConfigPrivate *priv;
 	
-	priv = view_config->priv;
-
 	e_cal_list_view_config_set_view (view_config, NULL);
 	
 	if (G_OBJECT_CLASS (e_cal_list_view_config_parent_class)->dispose)
Index: gui/e-cal-list-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-list-view.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-cal-list-view.c
--- gui/e-cal-list-view.c	17 Dec 2005 13:26:50 -0000	1.21
+++ gui/e-cal-list-view.c	9 Jan 2006 10:27:37 -0000
@@ -89,7 +89,7 @@ static gboolean  e_cal_list_view_on_tabl
 							 GdkEvent *event, gpointer data);
 static void e_cal_list_view_cursor_change_cb (ETable *etable, gint row, gpointer data);
 
-G_DEFINE_TYPE (ECalListView, e_cal_list_view, E_TYPE_CALENDAR_VIEW);
+G_DEFINE_TYPE (ECalListView, e_cal_list_view, E_TYPE_CALENDAR_VIEW)
 
 static void
 e_cal_list_view_class_init (ECalListViewClass *class)
Index: gui/e-cal-model-calendar.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-calendar.c,v
retrieving revision 1.22
diff -u -p -r1.22 e-cal-model-calendar.c
--- gui/e-cal-model-calendar.c	29 Nov 2005 08:15:08 -0000	1.22
+++ gui/e-cal-model-calendar.c	9 Jan 2006 10:27:37 -0000
@@ -49,7 +49,7 @@ static char *ecmc_value_to_string (ETabl
 static void ecmc_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
 					    ETableModel *source_model, gint row);
 
-G_DEFINE_TYPE (ECalModelCalendar, e_cal_model_calendar, E_TYPE_CAL_MODEL);
+G_DEFINE_TYPE (ECalModelCalendar, e_cal_model_calendar, E_TYPE_CAL_MODEL)
 
 static void
 e_cal_model_calendar_class_init (ECalModelCalendarClass *klass)
@@ -193,12 +193,9 @@ static void *
 ecmc_value_at (ETableModel *etm, int col, int row)
 {
 	ECalModelComponent *comp_data;
-	ECalModelCalendarPrivate *priv;
 	ECalModelCalendar *model = (ECalModelCalendar *) etm;
 
 	g_return_val_if_fail (E_IS_CAL_MODEL_CALENDAR (model), NULL);
-
-	priv = model->priv;
 
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_CALENDAR_FIELD_LAST, NULL);
 	g_return_val_if_fail (row >= 0 && row < e_table_model_row_count (etm), NULL);
Index: gui/e-cal-model-memos.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-memos.c,v
retrieving revision 1.2
diff -u -p -r1.2 e-cal-model-memos.c
--- gui/e-cal-model-memos.c	16 Nov 2005 11:13:31 -0000	1.2
+++ gui/e-cal-model-memos.c	9 Jan 2006 10:27:37 -0000
@@ -51,7 +51,7 @@ static char *ecmm_value_to_string (ETabl
 static void ecmm_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
 					    ETableModel *source_model, gint row);
 
-G_DEFINE_TYPE (ECalModelMemos, e_cal_model_memos, E_TYPE_CAL_MODEL);
+G_DEFINE_TYPE (ECalModelMemos, e_cal_model_memos, E_TYPE_CAL_MODEL)
 
 static void
 e_cal_model_memos_class_init (ECalModelMemosClass *klass)
@@ -115,12 +115,9 @@ static void *
 ecmm_value_at (ETableModel *etm, int col, int row)
 {
 	ECalModelComponent *comp_data;
-	ECalModelMemosPrivate *priv;
 	ECalModelMemos *model = (ECalModelMemos *) etm;
 
 	g_return_val_if_fail (E_IS_CAL_MODEL_MEMOS (model), NULL);
-
-	priv = model->priv;
 
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_MEMOS_FIELD_LAST, NULL);
 	g_return_val_if_fail (row >= 0 && row < e_table_model_row_count (etm), NULL);
Index: gui/e-cal-model-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model-tasks.c,v
retrieving revision 1.34
diff -u -p -r1.34 e-cal-model-tasks.c
--- gui/e-cal-model-tasks.c	6 Jan 2006 15:08:37 -0000	1.34
+++ gui/e-cal-model-tasks.c	9 Jan 2006 10:27:38 -0000
@@ -52,7 +52,7 @@ static const char *ecmt_get_color_for_co
 static void ecmt_fill_component_from_model (ECalModel *model, ECalModelComponent *comp_data,
 					    ETableModel *source_model, gint row);
 
-G_DEFINE_TYPE (ECalModelTasks, e_cal_model_tasks, E_TYPE_CAL_MODEL);
+G_DEFINE_TYPE (ECalModelTasks, e_cal_model_tasks, E_TYPE_CAL_MODEL)
 
 static void
 e_cal_model_tasks_class_init (ECalModelTasksClass *klass)
@@ -443,8 +443,6 @@ get_due_status (ECalModelTasks *model, E
 					return E_CAL_MODEL_TASKS_DUE_FUTURE;
 		}
 	}
-
-	return E_CAL_MODEL_TASKS_DUE_NEVER;
 }
 
 static gboolean
@@ -466,14 +464,11 @@ is_overdue (ECalModelTasks *model, ECalM
 static void *
 ecmt_value_at (ETableModel *etm, int col, int row)
 {
-	ECalModelTasksPrivate *priv;
 	ECalModelComponent *comp_data;
 	ECalModelTasks *model = (ECalModelTasks *) etm;
 
 	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), NULL);
 
-	priv = model->priv;
-
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, NULL);
 	g_return_val_if_fail (row >= 0 && row < e_table_model_row_count (etm), NULL);
 
@@ -783,14 +778,11 @@ set_url (ECalModelComponent *comp_data, 
 static void
 ecmt_set_value_at (ETableModel *etm, int col, int row, const void *value)
 {
-	ECalModelTasksPrivate *priv;
 	ECalModelComponent *comp_data;
 	ECalModelTasks *model = (ECalModelTasks *) etm;
 
 	g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
 
-	priv = model->priv;
-
 	g_return_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST);
 	g_return_if_fail (row >= 0 && row < e_table_model_row_count (etm));
 
@@ -841,13 +833,10 @@ ecmt_set_value_at (ETableModel *etm, int
 static gboolean
 ecmt_is_cell_editable (ETableModel *etm, int col, int row)
 {
-	ECalModelTasksPrivate *priv;
 	ECalModelTasks *model = (ECalModelTasks *) etm;
 
 	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), FALSE);
 
-	priv = model->priv;
-
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, FALSE);
 	g_return_val_if_fail (row >= -1 || (row >= 0 && row < e_table_model_row_count (etm)), FALSE);
 
@@ -964,14 +953,11 @@ ecmt_initialize_value (ETableModel *etm,
 static gboolean
 ecmt_value_is_empty (ETableModel *etm, int col, const void *value)
 {
-	ECalModelTasksPrivate *priv;
 	ECalModelTasks *model = (ECalModelTasks *) etm;
 
 	g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), TRUE);
 	g_return_val_if_fail (col >= 0 && col < E_CAL_MODEL_TASKS_FIELD_LAST, TRUE);
 
-	priv = model->priv;
-
 	if (col < E_CAL_MODEL_FIELD_LAST)
 		return E_TABLE_MODEL_CLASS (e_cal_model_tasks_parent_class)->value_is_empty (etm, col, value);
 
@@ -1096,14 +1082,11 @@ e_cal_model_tasks_new (void)
 void
 e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row)
 {
-	ECalModelTasksPrivate *priv;
 	ECalModelComponent *comp_data;
 
 	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)));
 
-	priv = model->priv;
-
 	comp_data = e_cal_model_get_component_at (E_CAL_MODEL (model), model_row);
 	if (comp_data) {
 		e_table_model_pre_change (E_TABLE_MODEL (model));
@@ -1121,14 +1104,12 @@ void
 e_cal_model_tasks_update_due_tasks (ECalModelTasks *model)
 {
 	gint row, row_count;
-	ECalModelTasksPrivate *priv;
 	ECalModelComponent *comp_data;
 	ECalModelTasksDueStatus status;
 
 	g_return_if_fail (E_IS_CAL_MODEL_TASKS (model));
 
 	row_count = e_table_model_row_count (E_TABLE_MODEL (model));
-	priv = model->priv;
 
 	for (row = 0; row < row_count; row++)
 	{
Index: gui/e-cal-model.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-model.c,v
retrieving revision 1.68
diff -u -p -r1.68 e-cal-model.c
--- gui/e-cal-model.c	19 Dec 2005 08:07:47 -0000	1.68
+++ gui/e-cal-model.c	9 Jan 2006 10:27:38 -0000
@@ -108,7 +108,7 @@ enum {
 
 static guint signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (ECalModel, e_cal_model, E_TABLE_MODEL_TYPE);
+G_DEFINE_TYPE (ECalModel, e_cal_model, E_TABLE_MODEL_TYPE)
 
 static void
 e_cal_model_class_init (ECalModelClass *klass)
@@ -326,8 +326,6 @@ get_classification (ECalModelComponent *
 	default:
 		return _("Unknown");
 	}
-
-	return _("Unknown");
 }
 
 static const char *
@@ -944,7 +942,6 @@ ecm_get_color_for_component (ECalModel *
 {
 	ESource *source;
 	guint32 source_color;
-	ECalModelPrivate *priv;
 	gint i, first_empty = 0;
 	static AssignedColorData assigned_colors[] = {
 		{ "#BECEDD", NULL }, /* 190 206 221     Blue */
@@ -961,8 +958,6 @@ ecm_get_color_for_component (ECalModel *
 
 	g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL);
 
-	priv = model->priv;
-             
 	source = e_cal_get_source (comp_data->client);
 	if (e_source_get_color (source, &source_color)) {
 		g_free (comp_data->color);
@@ -1168,8 +1163,6 @@ e_cal_model_set_default_client (ECalMode
 	priv = model->priv;
 
 	if (priv->default_client) {
-		ECalModelClient *client_data;
-		
 		client_data = find_client_data (model, priv->default_client);
 		g_assert (client_data);
 
@@ -1415,11 +1408,7 @@ e_cal_view_objects_added_cb (ECalView *q
 static void
 e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer user_data)
 {
-	ECalModelPrivate *priv;
 	ECalModel *model = (ECalModel *) user_data;
-	GList *l;
-	
-	priv = model->priv;
 
 	/* now re-add all objects */
 	e_cal_view_objects_added_cb (query, objects, model);
@@ -1601,14 +1590,11 @@ add_new_client (ECalModel *model, ECal *
 void
 e_cal_model_add_client (ECalModel *model, ECal *client)
 {
-	ECalModelPrivate *priv;
 	ECalModelClient *client_data;
-	
+
 	g_return_if_fail (E_IS_CAL_MODEL (model));
 	g_return_if_fail (E_IS_CAL (client));
-
-	priv = model->priv;
-
+	/* Check this return value or drop the assignment? */
 	client_data = add_new_client (model, client, TRUE);	
 }
 
@@ -1667,14 +1653,11 @@ remove_client (ECalModel *model, ECalMod
 void
 e_cal_model_remove_client (ECalModel *model, ECal *client)
 {
-	ECalModelPrivate *priv;
 	ECalModelClient *client_data;
 	
 	g_return_if_fail (E_IS_CAL_MODEL (model));
 	g_return_if_fail (E_IS_CAL (client));
 
-	priv = model->priv;
-
 	client_data = find_client_data (model, client);
 	if (client_data)
 		remove_client (model, client_data);
@@ -2102,9 +2085,8 @@ e_cal_model_get_object_array (ECalModel 
 void
 e_cal_model_set_instance_times (ECalModelComponent *comp_data, icaltimezone *zone)
 {
-	struct icaltimetype recur_time, start_time, end_time;
+	struct icaltimetype start_time, end_time;
 
-	recur_time = icalcomponent_get_recurrenceid (comp_data->icalcomp);
 	start_time = icalcomponent_get_dtstart (comp_data->icalcomp);
 	end_time = icalcomponent_get_dtend (comp_data->icalcomp);
 
Index: gui/e-cal-popup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cal-popup.c,v
retrieving revision 1.19
diff -u -p -r1.19 e-cal-popup.c
--- gui/e-cal-popup.c	5 Jan 2006 07:17:43 -0000	1.19
+++ gui/e-cal-popup.c	9 Jan 2006 10:27:38 -0000
@@ -156,7 +156,8 @@ ecalp_part_popup_saveas(EPopup *ep, EPop
 {
 	EPopupTarget *t = ep->target;
 	CamelMimePart *part = NULL;
-	char *file, *filename, *mfilename = NULL;
+	char *file, *mfilename = NULL;
+	const char *filename;
 
 	part = ((EAttachment *) ((ECalPopupTargetAttachments *) t)->attachments->data)->body;
 	filename = camel_mime_part_get_filename (part);
Index: gui/e-calendar-table-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table-config.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-calendar-table-config.c
--- gui/e-calendar-table-config.c	14 Oct 2004 15:22:32 -0000	1.3
+++ gui/e-calendar-table-config.c	9 Jan 2006 10:27:38 -0000
@@ -38,16 +38,14 @@ enum props {
 	PROP_TABLE
 };
 
-G_DEFINE_TYPE (ECalendarTableConfig, e_calendar_table_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ECalendarTableConfig, e_calendar_table_config, G_TYPE_OBJECT)
 
 static void
 e_calendar_table_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	ECalendarTableConfig *table_config;
-	ECalendarTableConfigPrivate *priv;
 
 	table_config = E_CALENDAR_TABLE_CONFIG (object);
-	priv = table_config->priv;
 	
 	switch (property_id) {
 	case PROP_TABLE:
@@ -63,10 +61,8 @@ static void
 e_calendar_table_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	ECalendarTableConfig *table_config;
-	ECalendarTableConfigPrivate *priv;
 
 	table_config = E_CALENDAR_TABLE_CONFIG (object);
-	priv = table_config->priv;
 	
 	switch (property_id) {
 	case PROP_TABLE:
@@ -82,10 +78,7 @@ static void
 e_calendar_table_config_dispose (GObject *object)
 {
 	ECalendarTableConfig *table_config = E_CALENDAR_TABLE_CONFIG (object);
-	ECalendarTableConfigPrivate *priv;
 	
-	priv = table_config->priv;
-
 	e_calendar_table_config_set_table (table_config, NULL);
 	
 	if (G_OBJECT_CLASS (e_calendar_table_config_parent_class)->dispose)
Index: gui/e-calendar-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.c,v
retrieving revision 1.148
diff -u -p -r1.148 e-calendar-table.c
--- gui/e-calendar-table.c	6 Jan 2006 15:08:37 -0000	1.148
+++ gui/e-calendar-table.c	9 Jan 2006 10:27:38 -0000
@@ -113,16 +113,14 @@ static GdkPixbuf* icon_pixbufs[E_CALENDA
 
 static GdkAtom clipboard_atom = GDK_NONE;
 
-G_DEFINE_TYPE (ECalendarTable, e_calendar_table, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (ECalendarTable, e_calendar_table, GTK_TYPE_TABLE)
 
 static void
 e_calendar_table_class_init (ECalendarTableClass *class)
 {
 	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
 
 	object_class = (GtkObjectClass *) class;
-	widget_class = (GtkWidgetClass *) class;
 
 	/* Method override */
 	object_class->destroy		= e_calendar_table_destroy;
Index: gui/e-calendar-table.h
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-table.h,v
retrieving revision 1.29
diff -u -p -r1.29 e-calendar-table.h
--- gui/e-calendar-table.h	3 Oct 2005 06:16:51 -0000	1.29
+++ gui/e-calendar-table.h	9 Jan 2006 10:27:38 -0000
@@ -110,6 +110,8 @@ void 	   e_calendar_table_open_task (ECa
 ECalModelComponent * e_calendar_table_get_selected_comp (ECalendarTable *cal_table);
 void e_calendar_table_hide_completed_tasks (ECalendarTable *table, GList *clients_list, gboolean config_changed);
 
+void e_calendar_table_process_completed_tasks (ECalendarTable *table, GList *clients_list, gboolean config_changed);
+
 G_END_DECLS
 
 #endif /* _E_CALENDAR_TABLE_H_ */
Index: gui/e-calendar-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-calendar-view.c,v
retrieving revision 1.108
diff -u -p -r1.108 e-calendar-view.c
--- gui/e-calendar-view.c	2 Jan 2006 14:12:39 -0000	1.108
+++ gui/e-calendar-view.c	9 Jan 2006 10:27:38 -0000
@@ -115,16 +115,14 @@ enum {
 
 static guint e_calendar_view_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (ECalendarView, e_calendar_view, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (ECalendarView, e_calendar_view, GTK_TYPE_TABLE)
 
 static void
 e_calendar_view_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	ECalendarView *cal_view;
-	ECalendarViewPrivate *priv;
 
 	cal_view = E_CALENDAR_VIEW (object);
-	priv = cal_view->priv;
 	
 	switch (property_id) {
 	case PROP_MODEL:
@@ -140,10 +138,8 @@ static void
 e_calendar_view_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	ECalendarView *cal_view;
-	ECalendarViewPrivate *priv;
 
 	cal_view = E_CALENDAR_VIEW (object);
-	priv = cal_view->priv;
 
 	switch (property_id) {
 	case PROP_MODEL:
@@ -1782,14 +1778,11 @@ e_calendar_view_new_appointment (ECalend
 static void
 open_event_with_flags (ECalendarView *cal_view, ECal *client, icalcomponent *icalcomp, guint32 flags)
 {
-	ECalendarViewPrivate *priv;
 	CompEditor *ce;
 	const char *uid;
 	ECalComponent *comp;
 
 
-	priv = cal_view->priv;
-
 	uid = icalcomponent_get_uid (icalcomp);
 
 	ce = e_comp_editor_registry_find (comp_editor_registry, uid);
@@ -1952,7 +1945,6 @@ e_calendar_view_get_tooltips (ECalendarV
 	e_cal_component_get_organizer (newcomp, &organiser);
 	if (organiser.cn) {
 		char *ptr ; 
-		GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
 		ptr = strchr(organiser.value, ':');
 		ptr++;
 		/* To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>" */
Index: gui/e-cell-date-edit-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cell-date-edit-config.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-cell-date-edit-config.c
--- gui/e-cell-date-edit-config.c	14 Oct 2004 15:36:27 -0000	1.3
+++ gui/e-cell-date-edit-config.c	9 Jan 2006 10:27:38 -0000
@@ -38,16 +38,14 @@ enum props {
 	PROP_CELL,
 };
 
-G_DEFINE_TYPE (ECellDateEditConfig, e_cell_date_edit_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ECellDateEditConfig, e_cell_date_edit_config, G_TYPE_OBJECT)
 
 static void
 e_cell_date_edit_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	ECellDateEditConfig *view_config;
-	ECellDateEditConfigPrivate *priv;
 
 	view_config = E_CELL_DATE_EDIT_CONFIG (object);
-	priv = view_config->priv;
 	
 	switch (property_id) {
 	case PROP_CELL:
@@ -63,10 +61,8 @@ static void
 e_cell_date_edit_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	ECellDateEditConfig *view_config;
-	ECellDateEditConfigPrivate *priv;
 
 	view_config = E_CELL_DATE_EDIT_CONFIG (object);
-	priv = view_config->priv;
 	
 	switch (property_id) {
 	case PROP_CELL:
@@ -82,10 +78,7 @@ static void
 e_cell_date_edit_config_dispose (GObject *object)
 {
 	ECellDateEditConfig *view_config = E_CELL_DATE_EDIT_CONFIG (object);
-	ECellDateEditConfigPrivate *priv;
 	
-	priv = view_config->priv;
-
 	e_cell_date_edit_config_set_cell (view_config, NULL);
 	
 	if (G_OBJECT_CLASS (e_cell_date_edit_config_parent_class)->dispose)
Index: gui/e-cell-date-edit-text.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-cell-date-edit-text.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-cell-date-edit-text.c
--- gui/e-cell-date-edit-text.c	24 Nov 2005 15:11:49 -0000	1.15
+++ gui/e-cell-date-edit-text.c	9 Jan 2006 10:27:38 -0000
@@ -43,7 +43,7 @@
 
 #include "e-cell-date-edit-text.h"
 
-G_DEFINE_TYPE (ECellDateEditText, e_cell_date_edit_text, E_CELL_TEXT_TYPE);
+G_DEFINE_TYPE (ECellDateEditText, e_cell_date_edit_text, E_CELL_TEXT_TYPE)
 
 void
 e_cell_date_edit_text_set_timezone (ECellDateEditText *ecd,
Index: gui/e-comp-editor-registry.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-comp-editor-registry.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-comp-editor-registry.c
--- gui/e-comp-editor-registry.c	14 Oct 2004 15:36:27 -0000	1.11
+++ gui/e-comp-editor-registry.c	9 Jan 2006 10:27:38 -0000
@@ -43,7 +43,7 @@ typedef struct _ECompEditorRegistryForea
 
 static void editor_destroy_cb (gpointer data, GObject *where_object_was);
 
-G_DEFINE_TYPE (ECompEditorRegistry, e_comp_editor_registry, G_TYPE_OBJECT);
+G_DEFINE_TYPE (ECompEditorRegistry, e_comp_editor_registry, G_TYPE_OBJECT)
 
 static void
 registry_data_free (gpointer data)
Index: gui/e-date-edit-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-date-edit-config.c,v
retrieving revision 1.2
diff -u -p -r1.2 e-date-edit-config.c
--- gui/e-date-edit-config.c	14 Oct 2004 15:36:27 -0000	1.2
+++ gui/e-date-edit-config.c	9 Jan 2006 10:27:38 -0000
@@ -35,16 +35,14 @@ enum props {
 	PROP_EDIT,
 };
 
-G_DEFINE_TYPE (EDateEditConfig, e_date_edit_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EDateEditConfig, e_date_edit_config, G_TYPE_OBJECT)
 
 static void
 e_date_edit_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	EDateEditConfig *edit_config;
-	EDateEditConfigPrivate *priv;
 
 	edit_config = E_DATE_EDIT_CONFIG (object);
-	priv = edit_config->priv;
 	
 	switch (property_id) {
 	case PROP_EDIT:
@@ -60,10 +58,8 @@ static void
 e_date_edit_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	EDateEditConfig *edit_config;
-	EDateEditConfigPrivate *priv;
 
 	edit_config = E_DATE_EDIT_CONFIG (object);
-	priv = edit_config->priv;
 	
 	switch (property_id) {
 	case PROP_EDIT:
@@ -79,10 +75,7 @@ static void
 e_date_edit_config_dispose (GObject *object)
 {
 	EDateEditConfig *edit_config = E_DATE_EDIT_CONFIG (object);
-	EDateEditConfigPrivate *priv;
 	
-	priv = edit_config->priv;
-
 	e_date_edit_config_set_edit (edit_config, NULL);
 	
 	if (G_OBJECT_CLASS (e_date_edit_config_parent_class)->dispose)
Index: gui/e-day-view-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-config.c,v
retrieving revision 1.10
diff -u -p -r1.10 e-day-view-config.c
--- gui/e-day-view-config.c	30 May 2005 09:14:26 -0000	1.10
+++ gui/e-day-view-config.c	9 Jan 2006 10:27:38 -0000
@@ -36,16 +36,14 @@ enum props {
 	PROP_VIEW,
 };
 
-G_DEFINE_TYPE (EDayViewConfig, e_day_view_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EDayViewConfig, e_day_view_config, G_TYPE_OBJECT)
 
 static void
 e_day_view_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	EDayViewConfig *view_config;
-	EDayViewConfigPrivate *priv;
 
 	view_config = E_DAY_VIEW_CONFIG (object);
-	priv = view_config->priv;
 	
 	switch (property_id) {
 	case PROP_VIEW:
@@ -61,10 +59,8 @@ static void
 e_day_view_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	EDayViewConfig *view_config;
-	EDayViewConfigPrivate *priv;
 
 	view_config = E_DAY_VIEW_CONFIG (object);
-	priv = view_config->priv;
 	
 	switch (property_id) {
 	case PROP_VIEW:
@@ -80,9 +76,6 @@ static void
 e_day_view_config_dispose (GObject *object)
 {
 	EDayViewConfig *view_config = E_DAY_VIEW_CONFIG (object);
-	EDayViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
 
 	e_day_view_config_set_view (view_config, NULL);
 	
Index: gui/e-day-view-main-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-main-item.c,v
retrieving revision 1.44
diff -u -p -r1.44 e-day-view-main-item.c
--- gui/e-day-view-main-item.c	30 May 2005 09:14:26 -0000	1.44
+++ gui/e-day-view-main-item.c	9 Jan 2006 10:27:38 -0000
@@ -81,7 +81,7 @@ enum {
 	ARG_DAY_VIEW
 };
 
-G_DEFINE_TYPE (EDayViewMainItem, e_day_view_main_item, GNOME_TYPE_CANVAS_ITEM);
+G_DEFINE_TYPE (EDayViewMainItem, e_day_view_main_item, GNOME_TYPE_CANVAS_ITEM)
 
 static void
 e_day_view_main_item_class_init (EDayViewMainItemClass *class)
@@ -119,10 +119,8 @@ e_day_view_main_item_init (EDayViewMainI
 static void
 e_day_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 {
-	GnomeCanvasItem *item;
 	EDayViewMainItem *dvmitem;
 
-	item = GNOME_CANVAS_ITEM (o);
 	dvmitem = E_DAY_VIEW_MAIN_ITEM (o);
 	
 	switch (arg_id){
@@ -500,7 +498,6 @@ e_day_view_main_item_draw_day_event (EDa
 	EDayView *day_view;
 	EDayViewEvent *event;
 	gint item_x, item_y, item_w, item_h, bar_y1, bar_y2;
-	GtkStyle *style;
 	GdkGC *gc;
 	GdkColor bg_color;
 	ECalComponent *comp;
@@ -519,8 +516,6 @@ e_day_view_main_item_draw_day_event (EDa
 	    && day_view->drag_event_num == event_num)
 		return;
 
-	style = GTK_WIDGET (day_view)->style;
-
 	gc = day_view->main_gc;
 
 	/* Get the position of the event. If it is not shown skip it.*/
@@ -841,10 +836,6 @@ e_day_view_main_item_point (GnomeCanvasI
 static gint
 e_day_view_main_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
-	EDayViewMainItem *dvtitem;
-
-	dvtitem = E_DAY_VIEW_MAIN_ITEM (item);
-
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 
Index: gui/e-day-view-time-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-time-item.c,v
retrieving revision 1.34
diff -u -p -r1.34 e-day-view-time-item.c
--- gui/e-day-view-time-item.c	23 Jun 2005 09:11:05 -0000	1.34
+++ gui/e-day-view-time-item.c	9 Jan 2006 10:27:39 -0000
@@ -103,7 +103,7 @@ enum {
 	ARG_DAY_VIEW
 };
 
-G_DEFINE_TYPE (EDayViewTimeItem, e_day_view_time_item, GNOME_TYPE_CANVAS_ITEM);
+G_DEFINE_TYPE (EDayViewTimeItem, e_day_view_time_item, GNOME_TYPE_CANVAS_ITEM)
 
 static void
 e_day_view_time_item_class_init (EDayViewTimeItemClass *class)
@@ -138,10 +138,8 @@ e_day_view_time_item_init (EDayViewTimeI
 static void
 e_day_view_time_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 {
-	GnomeCanvasItem *item;
 	EDayViewTimeItem *dvtmitem;
 
-	item = GNOME_CANVAS_ITEM (o);
 	dvtmitem = E_DAY_VIEW_TIME_ITEM (o);
 	
 	switch (arg_id){
@@ -180,15 +178,12 @@ e_day_view_time_item_get_column_width (E
 	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;
-	PangoContext *context;
 
 	day_view = dvtmitem->day_view;
 	g_return_val_if_fail (day_view != NULL, 0);
 
 	style = gtk_widget_get_style (GTK_WIDGET (day_view));
 	g_return_val_if_fail (style != NULL, 0);
-
-	context = gtk_widget_get_pango_context (GTK_WIDGET (day_view));
 
 	/* Find the maximum width a digit can have. FIXME: We could use pango's
 	 * approximation function, but I worry it won't be precise enough. Also
Index: gui/e-day-view-top-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view-top-item.c,v
retrieving revision 1.44
diff -u -p -r1.44 e-day-view-top-item.c
--- gui/e-day-view-top-item.c	6 May 2005 03:29:56 -0000	1.44
+++ gui/e-day-view-top-item.c	9 Jan 2006 10:27:39 -0000
@@ -78,7 +78,7 @@ enum {
 	ARG_DAY_VIEW
 };
 
-G_DEFINE_TYPE (EDayViewTopItem, e_day_view_top_item, GNOME_TYPE_CANVAS_ITEM);
+G_DEFINE_TYPE (EDayViewTopItem, e_day_view_top_item, GNOME_TYPE_CANVAS_ITEM)
 
 static void
 e_day_view_top_item_class_init (EDayViewTopItemClass *class)
@@ -113,10 +113,8 @@ e_day_view_top_item_init (EDayViewTopIte
 static void
 e_day_view_top_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 {
-	GnomeCanvasItem *item;
 	EDayViewTopItem *dvtitem;
 
-	item = GNOME_CANVAS_ITEM (o);
 	dvtitem = E_DAY_VIEW_TOP_ITEM (o);
 	
 	switch (arg_id){
@@ -307,7 +305,7 @@ e_day_view_top_item_draw_long_event (EDa
 	EDayView *day_view;
 	EDayViewEvent *event;
 	GtkStyle *style;
-	GdkGC *gc, *fg_gc, *bg_gc;
+	GdkGC *gc, *fg_gc;
 	gint start_day, end_day;
 	gint item_x, item_y, item_w, item_h;
 	gint text_x, icon_x, icon_y, icon_x_inc;
@@ -342,7 +340,6 @@ e_day_view_top_item_draw_long_event (EDa
 	style = gtk_widget_get_style (GTK_WIDGET (day_view));
 	gc = day_view->main_gc;
 	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
@@ -606,7 +603,6 @@ e_day_view_top_item_draw_triangle (EDayV
 {
 	EDayView *day_view;
 	EDayViewEvent *event;
-	GtkStyle *style;
 	GdkGC *gc;
 	GdkColor bg_color;
 	GdkPoint points[3];
@@ -614,7 +610,6 @@ e_day_view_top_item_draw_triangle (EDayV
 
 	day_view = dvtitem->day_view;
 
-	style = GTK_WIDGET (day_view)->style;
 	gc = day_view->main_gc;
 
 	points[0].x = x;
@@ -671,10 +666,6 @@ e_day_view_top_item_point (GnomeCanvasIt
 static gint
 e_day_view_top_item_event (GnomeCanvasItem *item, GdkEvent *event)
 {
-	EDayViewTopItem *dvtitem;
-
-	dvtitem = E_DAY_VIEW_TOP_ITEM (item);
-
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 
Index: gui/e-day-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-day-view.c,v
retrieving revision 1.292
diff -u -p -r1.292 e-day-view.c
--- gui/e-day-view.c	6 Jan 2006 04:27:54 -0000	1.292
+++ gui/e-day-view.c	9 Jan 2006 10:27:40 -0000
@@ -359,8 +359,6 @@ static void e_day_view_start_auto_scroll
 					  gboolean scroll_up);
 static gboolean e_day_view_auto_scroll_handler (gpointer data);
 
-static EDayViewEvent* e_day_view_get_popup_menu_event (EDayView *day_view);
-
 static gboolean e_day_view_on_top_canvas_drag_motion (GtkWidget      *widget,
 						      GdkDragContext *context,
 						      gint            x,
@@ -417,10 +415,6 @@ static void e_day_view_on_main_canvas_dr
 							  guint           time,
 							  EDayView	 *day_view);
 
-static gboolean e_day_view_update_event_cb (EDayView *day_view,
-					    gint day,
-					    gint event_num,
-					    gpointer data);
 static gboolean e_day_view_remove_event_cb (EDayView *day_view,
 					    gint day,
 					    gint event_num,
@@ -439,7 +433,7 @@ static void e_day_view_queue_layout (EDa
 static void e_day_view_cancel_layout (EDayView *day_view);
 static gboolean e_day_view_layout_timeout_cb (gpointer data);
 
-G_DEFINE_TYPE (EDayView, e_day_view, E_TYPE_CALENDAR_VIEW);
+G_DEFINE_TYPE (EDayView, e_day_view, E_TYPE_CALENDAR_VIEW)
 
 static void
 e_day_view_class_init (EDayViewClass *class)
@@ -526,6 +520,7 @@ process_component (EDayView *day_view, E
 		rid = e_cal_component_get_recurid_as_string (comp);
 	else
 		rid = NULL;
+	/* rid is never used below here, why? */
 
 	/* Add the object */
 	add_event_data.day_view = day_view;
@@ -1198,7 +1193,7 @@ e_day_view_style_set (GtkWidget *widget,
 {
 	EDayView *day_view;
 	gint top_rows, top_canvas_height;
-	gint hour, max_large_hour_width;
+	gint hour;
 	gint minute, max_minute_width, i;
 	gint month, day, width;
 	gint longest_month_width, longest_abbreviated_month_width;
@@ -1344,7 +1339,6 @@ e_day_view_style_set (GtkWidget *widget,
 
 	/* Calculate the widths of all the time strings necessary. */
 	day_view->max_small_hour_width = 0;
-	max_large_hour_width = 0;
 	for (hour = 0; hour < 24; hour++) {
 		g_snprintf (buffer, sizeof (buffer), "%02i", hour);
 		pango_layout_set_text (layout, buffer, -1);
@@ -1445,7 +1439,6 @@ e_day_view_recalc_cell_sizes	(EDayView	*
 	gint day, max_width;
 	struct tm date_tm;
 	char buffer[128];
-	PangoFontDescription *font_desc;
 	PangoContext *pango_context;
 	PangoLayout *layout;
 	gint pango_width;
@@ -1453,7 +1446,6 @@ e_day_view_recalc_cell_sizes	(EDayView	*
 	g_return_if_fail (((GtkWidget*)day_view)->style != NULL);
 
 	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (GTK_WIDGET (day_view))->font_desc;
 	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (day_view));
 	layout = pango_layout_new (pango_context);
 
@@ -1575,46 +1567,6 @@ e_day_view_focus_out (GtkWidget *widget,
 	return FALSE;
 }
 
-static gboolean
-e_day_view_update_event_cb (EDayView *day_view,
-			    gint day,
-			    gint event_num,
-			    gpointer data)
-{
-	EDayViewEvent *event;
-	ECalModelComponent *comp_data;
-
-	comp_data = data;
-#if 0
-	g_print ("In e_day_view_update_event_cb day:%i event_num:%i\n",
-		 day, event_num);
-#endif
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		event = &g_array_index (day_view->long_events, EDayViewEvent,
-					event_num);
-	} else {
-		event = &g_array_index (day_view->events[day], EDayViewEvent,
-					event_num);
-	}
-
-	e_cal_model_free_component_data (event->comp_data);
-	event->comp_data = e_cal_model_copy_component_data (comp_data);
-
-	if (day == E_DAY_VIEW_LONG_EVENT) {
-		e_day_view_update_long_event_label (day_view, event_num);
-		e_day_view_reshape_long_event (day_view, event_num);
-	} else {
-		e_day_view_update_event_label (day_view, day, event_num);
-		e_day_view_reshape_day_event (day_view, day, event_num);
-	}
-
-	g_signal_emit_by_name (G_OBJECT(day_view),
-			       "event_changed", event);
-
-	return TRUE;
-}
-
-
 /* This calls a given function for each event instance (in both views).
    If the callback returns FALSE the iteration is stopped.
    Note that it is safe for the callback to remove the event (since we
@@ -1624,6 +1576,7 @@ e_day_view_foreach_event		(EDayView	*day
 					 EDayViewForeachEventCallback callback,
 					 gpointer	 data)
 {
+	/* event is never used after being set in the for loop below, why? */
 	EDayViewEvent *event;
 	gint day, event_num;
 
@@ -1747,6 +1700,7 @@ e_day_view_remove_event_cb (EDayView *da
 	return TRUE;
 }
 
+#if 0
 /*  Checks if the users participation status is Needs action and shows the summary as bold text*/
 static void
 set_text_as_bold (EDayViewEvent *event)
@@ -1780,6 +1734,7 @@ set_text_as_bold (EDayViewEvent *event)
 	g_object_unref (comp);
 	g_free (address);
 }
+#endif
 
 /* This updates the text shown for an event. If the event start or end do not
    lie on a row boundary, the time is displayed before the summary. */
@@ -3211,11 +3166,10 @@ e_day_view_on_event_click (EDayView *day
 static void
 e_day_view_reshape_resize_long_event_rect_item (EDayView *day_view)
 {
-	gint day, event_num, start_day, end_day;
+	gint event_num, start_day, end_day;
 	gint item_x, item_y, item_w, item_h;
 	gdouble x1, y1, x2, y2;
 
-	day = day_view->resize_event_day;
 	event_num = day_view->resize_event_num;
 
 	/* If we're not resizing an event, or the event is not shown,
@@ -3413,23 +3367,6 @@ e_day_view_on_event_right_click (EDayVie
 				    day, event_num);
 }
 
-static EDayViewEvent*
-e_day_view_get_popup_menu_event (EDayView *day_view)
-{
-	if (day_view->popup_event_num == -1)
-		return NULL;
-
-	if (day_view->popup_event_day == E_DAY_VIEW_LONG_EVENT)
-		return &g_array_index (day_view->long_events,
-				       EDayViewEvent,
-				       day_view->popup_event_num);
-	else
-		return &g_array_index (day_view->events[day_view->popup_event_day],
-				       EDayViewEvent,
-				       day_view->popup_event_num);
-}
-
-
 static gboolean
 e_day_view_on_top_canvas_button_release (GtkWidget *widget,
 					 GdkEventButton *event,
@@ -3820,6 +3757,7 @@ static void
 e_day_view_update_long_event_resize (EDayView *day_view,
 				     gint day)
 {
+	/* event is never used here either, what's up? */
 	EDayViewEvent *event;
 	gint event_num;
 	gboolean need_reshape = FALSE;
@@ -3860,6 +3798,7 @@ static void
 e_day_view_update_resize (EDayView *day_view,
 			  gint row)
 {
+	/* Same thing again? */
 	EDayViewEvent *event;
 	gint day, event_num;
 	gboolean need_reshape = FALSE;
@@ -4378,7 +4317,6 @@ e_day_view_reshape_long_event (EDayView 
 	gint min_text_x, max_text_w, text_width, line_len;
 	gchar *text, *end_of_line;
 	gboolean show_icons = TRUE, use_max_width = FALSE;
-	PangoFontDescription *font_desc;
 	PangoContext *pango_context;
 	PangoLayout *layout;
 
@@ -4409,7 +4347,6 @@ e_day_view_reshape_long_event (EDayView 
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
 	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (GTK_WIDGET (day_view))->font_desc;
 	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (day_view));
 	layout = pango_layout_new (pango_context);
 
@@ -4466,8 +4403,8 @@ e_day_view_reshape_long_event (EDayView 
 					       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 					       "im_context", E_CANVAS (day_view->top_canvas)->im_context,
 					       NULL);
-		g_object_set_data (event->canvas_item, "event-num", GINT_TO_POINTER (event_num));
-		g_object_set_data (event->canvas_item, "event-day", GINT_TO_POINTER (E_DAY_VIEW_LONG_EVENT));
+		g_object_set_data (G_OBJECT (event->canvas_item), "event-num", GINT_TO_POINTER (event_num));
+		g_object_set_data (G_OBJECT (event->canvas_item), "event-day", GINT_TO_POINTER (E_DAY_VIEW_LONG_EVENT));
 		g_signal_connect (event->canvas_item, "event",
 				  G_CALLBACK (e_day_view_on_text_item_event), day_view);
 		g_signal_emit_by_name (G_OBJECT(day_view),
@@ -4649,8 +4586,8 @@ e_day_view_reshape_day_event (EDayView *
 						       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 						       "im_context", E_CANVAS (day_view->main_canvas)->im_context,
 						       NULL);
-			g_object_set_data (event->canvas_item, "event-num", GINT_TO_POINTER (event_num));
-			g_object_set_data (event->canvas_item, "event-day", GINT_TO_POINTER (day));
+			g_object_set_data (G_OBJECT (event->canvas_item), "event-num", GINT_TO_POINTER (event_num));
+			g_object_set_data (G_OBJECT (event->canvas_item), "event-day", GINT_TO_POINTER (day));
 			g_signal_connect (event->canvas_item, "event",
 					  G_CALLBACK (e_day_view_on_text_item_event), day_view);
 			g_signal_emit_by_name (G_OBJECT(day_view),
@@ -5064,6 +5001,7 @@ e_day_view_change_duration_to_start_of_w
 	if (day_view->selection_in_top_canvas)
 		return;
 	else {
+		/* These are never used after being set? */
 		gint work_start_row,work_end_row,selection_start_row,selection_end_row;
 		
 		work_start_row =
@@ -5792,8 +5730,8 @@ tooltip_get_view_event (EDayView *day_vi
 static void
 tooltip_destroy (EDayView *day_view, GnomeCanvasItem *item)
 {
-	int day = GPOINTER_TO_INT (g_object_get_data (item, "event-day"));
-	int event_num = GPOINTER_TO_INT (g_object_get_data (item, "event-num"));
+	int day = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-day"));
+	int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 	EDayViewEvent *pevent;
 
 	pevent = tooltip_get_view_event (day_view, day, event_num);
@@ -5874,8 +5812,8 @@ e_day_view_on_text_item_event (GnomeCanv
 		return FALSE;
 	case GDK_ENTER_NOTIFY:
 		{
-			int day = GPOINTER_TO_INT (g_object_get_data (item, "event-day"));
-			int event_num = GPOINTER_TO_INT (g_object_get_data (item, "event-num"));
+			int day = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-day"));
+			int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 			EDayViewEvent *pevent;
 			ECalendarViewEventData *data;
 			
@@ -5899,8 +5837,8 @@ e_day_view_on_text_item_event (GnomeCanv
 		return TRUE;
 	case GDK_MOTION_NOTIFY:
 		{
-			int day = GPOINTER_TO_INT (g_object_get_data (item, "event-day"));
-			int event_num = GPOINTER_TO_INT (g_object_get_data (item, "event-num"));
+			int day = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-day"));
+			int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 			EDayViewEvent *pevent;
 
 			pevent = tooltip_get_view_event (day_view, day, event_num);
@@ -6182,7 +6120,6 @@ e_day_view_on_editing_stopped (EDayView 
 			       GnomeCanvasItem *item)
 {
 	gint day, event_num;
-	gboolean editing_long_event = FALSE;
 	EDayViewEvent *event;
 	gchar *text = NULL;
 	ECalComponentText summary;
@@ -6206,7 +6143,6 @@ e_day_view_on_editing_stopped (EDayView 
 		return;
 
 	if (day == E_DAY_VIEW_LONG_EVENT) {
-		editing_long_event = TRUE;
 		event = &g_array_index (day_view->long_events, EDayViewEvent,
 					event_num);
 	} else {
Index: gui/e-itip-control.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-itip-control.c,v
retrieving revision 1.173
diff -u -p -r1.173 e-itip-control.c
--- gui/e-itip-control.c	6 Jan 2006 15:08:36 -0000	1.173
+++ gui/e-itip-control.c	9 Jan 2006 10:27:40 -0000
@@ -113,15 +113,13 @@ static void url_requested_cb (GtkHTML *h
 static gboolean object_requested_cb (GtkHTML *html, GtkHTMLEmbedded *eb, gpointer data);
 static void ok_clicked_cb (GtkWidget *widget, gpointer data);
 
-G_DEFINE_TYPE (EItipControl, e_itip_control, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (EItipControl, e_itip_control, GTK_TYPE_VBOX)
 
 static void
 e_itip_control_class_init (EItipControlClass *klass)
 {
-	GObjectClass *object_class;
 	GtkObjectClass *gtkobject_class;
 	
-	object_class = G_OBJECT_CLASS (klass);
 	gtkobject_class = GTK_OBJECT_CLASS (klass);
 	
 	gtkobject_class->destroy = e_itip_control_destroy;
@@ -276,7 +274,6 @@ find_cal_opened_cb (ECal *ecal, ECalenda
 	if (fd->count == 0) {
 		if (fd->show_selector && !priv->current_ecal && priv->vbox) {
 			GtkWidget *esom;
-			ESource *source = NULL;
 			char *uid;
 
 			switch (priv->type) {
@@ -353,7 +350,7 @@ find_server (EItipControl *itip, ECalCom
 				fd->show_selector = show_selector;
 			}
 			fd->count++;
-
+			/* Check this return too? */
 			ecal = start_calendar_server (itip, source, priv->type, find_cal_opened_cb, fd);				
 		}		
 	}
@@ -846,15 +843,12 @@ static void
 set_date_label (EItipControl *itip, GtkHTML *html, GtkHTMLStream *html_stream,
 		ECalComponent *comp)
 {
-	EItipControlPrivate *priv;
 	ECalComponentDateTime datetime;
 	static char buffer[1024];
 	gchar *str;
 	gboolean wrote = FALSE, task_completed = FALSE;
 	ECalComponentVType type;
 
-	priv = itip->priv;
-
 	type = e_cal_component_get_vtype (comp);
 
 	buffer[0] = '\0';
@@ -1988,35 +1982,6 @@ update_attendee_status (EItipControl *it
 }
 
 static void
-remove_item (EItipControl *itip)
-{
-	EItipControlPrivate *priv;
-	const char *uid;
-	GtkWidget *dialog;
-	GError *error = NULL;
-	
-	priv = itip->priv;
-
-	/* FIXME Is this check necessary? */
-	if (!priv->current_ecal)
-		return;
-	
-	e_cal_component_get_uid (priv->comp, &uid);
-	if (e_cal_component_has_recurrences (priv->comp))
-		e_cal_remove_object_with_mod (priv->current_ecal, uid, NULL, CALOBJ_MOD_ALL, &error);
-	else
-		e_cal_remove_object (priv->current_ecal, uid, &error);
-	if (!error || error->code == E_CALENDAR_STATUS_OBJECT_NOT_FOUND) {
-		dialog = gnome_ok_dialog (_("Removal Complete"));
-		gnome_dialog_run_and_close (GNOME_DIALOG (dialog));
-	} else {
-		delete_error_dialog (error, e_cal_component_get_vtype (priv->comp));
-	}
-	
-	g_clear_error (&error);
-}
-
-static void
 send_item (EItipControl *itip)
 {
 	EItipControlPrivate *priv;
@@ -2470,7 +2435,6 @@ ok_clicked_cb (GtkWidget *widget, gpoint
 
 	if (priv->rsvp && status) {
 		ECalComponent *comp = NULL;
-		ECalComponentVType vtype;
 		icalcomponent *ical_comp;
 		icalproperty *prop;
 		icalvalue *value;
@@ -2480,7 +2444,6 @@ ok_clicked_cb (GtkWidget *widget, gpoint
 		comp = e_cal_component_clone (priv->comp);
 		if (comp == NULL)
 			return;
-		vtype = e_cal_component_get_vtype (comp);
 		
 		if (priv->my_address == NULL)
 			find_my_address (itip, priv->ical_comp, NULL);
Index: gui/e-meeting-attendee.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-attendee.c,v
retrieving revision 1.12
diff -u -p -r1.12 e-meeting-attendee.c
--- gui/e-meeting-attendee.c	14 Oct 2004 15:53:29 -0000	1.12
+++ gui/e-meeting-attendee.c	9 Jan 2006 10:27:40 -0000
@@ -69,7 +69,7 @@ static guint signals[LAST_SIGNAL];
 
 static void e_meeting_attendee_finalize	(GObject *obj);
 
-G_DEFINE_TYPE (EMeetingAttendee, e_meeting_attendee, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EMeetingAttendee, e_meeting_attendee, G_TYPE_OBJECT)
 
 static void
 e_meeting_attendee_class_init (EMeetingAttendeeClass *klass)
Index: gui/e-meeting-list-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-list-view.c,v
retrieving revision 1.25
diff -u -p -r1.25 e-meeting-list-view.c
--- gui/e-meeting-list-view.c	22 Dec 2005 10:12:06 -0000	1.25
+++ gui/e-meeting-list-view.c	9 Jan 2006 10:27:40 -0000
@@ -42,6 +42,7 @@
 #include <libedataserverui/e-name-selector.h>
 #include "calendar-config.h"
 #include "e-meeting-list-view.h"
+#include "itip-utils.h"
 #include <misc/e-cell-renderer-combo.h>
 #include <libebook/e-destination.h>
 #include "e-select-names-renderer.h"
@@ -77,7 +78,7 @@ static icalparameter_role roles[] = {ICA
 				     ICAL_ROLE_NONPARTICIPANT,
 				     ICAL_ROLE_NONE};
 
-G_DEFINE_TYPE (EMeetingListView, e_meeting_list_view, GTK_TYPE_TREE_VIEW);
+G_DEFINE_TYPE (EMeetingListView, e_meeting_list_view, GTK_TYPE_TREE_VIEW)
 
 static void
 e_meeting_list_view_finalize (GObject *obj)
@@ -285,7 +286,7 @@ e_meeting_list_view_remove_attendee_from
 
 		if (e_destination_is_evolution_list (des)) {
 			GList *l, *dl;
-	
+
 			dl = e_destination_list_get_dests (des);
 
 			for (l = dl; l; l = l->next) {
Index: gui/e-meeting-store.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-store.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-meeting-store.c
--- gui/e-meeting-store.c	17 Dec 2005 13:35:24 -0000	1.15
+++ gui/e-meeting-store.c	9 Jan 2006 10:27:40 -0000
@@ -159,8 +159,6 @@ role_to_text (icalparameter_role role) 
 	default:
 		return _("Unknown");
 	}
-
-	return NULL;
 }
 
 static gboolean
@@ -224,8 +222,6 @@ partstat_to_text (icalparameter_partstat
 	default:
 		return _("Unknown");
 	}
-
-	return NULL;
 }
 
 static GtkTreeModelFlags
@@ -516,41 +512,6 @@ e_meeting_store_set_value (EMeetingStore
 		e_meeting_attendee_set_language (attendee, g_strdup (val));
 		break;
 	}
-}
-
-static gboolean
-is_cell_editable (EMeetingStore *etm, int col, int row)
-{
-	EMeetingStore *store;
-	EMeetingStorePrivate *priv;
-	EMeetingAttendee *attendee;
-	EMeetingAttendeeEditLevel level;
-	
-	store = E_MEETING_STORE (etm);	
-	priv = store->priv;
-	
-	if (col == E_MEETING_STORE_DELTO_COL
-	    || col == E_MEETING_STORE_DELFROM_COL)
-		return FALSE;
-	
-	if (row == -1)
-		return TRUE;
-	if (row >= priv->attendees->len)
-		return TRUE;
-	
-	attendee = g_ptr_array_index (priv->attendees, row);
-	level = e_meeting_attendee_get_edit_level (attendee);
-
-	switch (level) {
-	case E_MEETING_ATTENDEE_EDIT_FULL:
-		return TRUE;
-	case E_MEETING_ATTENDEE_EDIT_STATUS:
-		return col == E_MEETING_STORE_STATUS_COL;
-	case E_MEETING_ATTENDEE_EDIT_NONE:
-		return FALSE;
-	}
-
-	return TRUE;
 }
 
 static void
Index: gui/e-meeting-time-sel-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel-item.c,v
retrieving revision 1.15
diff -u -p -r1.15 e-meeting-time-sel-item.c
--- gui/e-meeting-time-sel-item.c	14 Oct 2004 15:53:29 -0000	1.15
+++ gui/e-meeting-time-sel-item.c	9 Jan 2006 10:27:40 -0000
@@ -100,7 +100,7 @@ enum {
 	ARG_MEETING_TIME_SELECTOR
 };
 
-G_DEFINE_TYPE (EMeetingTimeSelectorItem, e_meeting_time_selector_item, GNOME_TYPE_CANVAS_ITEM);
+G_DEFINE_TYPE (EMeetingTimeSelectorItem, e_meeting_time_selector_item, GNOME_TYPE_CANVAS_ITEM)
 
 static void
 e_meeting_time_selector_item_class_init (EMeetingTimeSelectorItemClass *mts_item_class)
@@ -174,10 +174,8 @@ e_meeting_time_selector_item_destroy (Gt
 static void
 e_meeting_time_selector_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 {
-	GnomeCanvasItem *item;
 	EMeetingTimeSelectorItem *mts_item;
 
-	item = GNOME_CANVAS_ITEM (o);
 	mts_item = E_MEETING_TIME_SELECTOR_ITEM (o);
 	
 	switch (arg_id){
@@ -510,6 +508,7 @@ e_meeting_time_selector_item_paint_all_a
 	/* Get the first visible busy periods for all the attendees. */
 	first_periods = g_new (gint, e_meeting_store_count_actual_attendees (mts->model));
 	for (row = 0; row < e_meeting_store_count_actual_attendees (mts->model); row++) {
+		/* This is never used */
 		ia = e_meeting_store_find_attendee_at_row (mts->model, row);
 		first_periods[row] = e_meeting_time_selector_item_find_first_busy_period (mts_item, date, row);
 	}
Index: gui/e-meeting-time-sel.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-meeting-time-sel.c,v
retrieving revision 1.72
diff -u -p -r1.72 e-meeting-time-sel.c
--- gui/e-meeting-time-sel.c	21 Dec 2005 08:33:19 -0000	1.72
+++ gui/e-meeting-time-sel.c	9 Jan 2006 10:27:41 -0000
@@ -210,7 +210,7 @@ static void row_deleted_cb (GtkTreeModel
 static void free_busy_template_changed_cb (GConfClient *client, guint cnxn_id,
 					   GConfEntry *entry, gpointer user_data);
 
-G_DEFINE_TYPE (EMeetingTimeSelector, e_meeting_time_selector, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (EMeetingTimeSelector, e_meeting_time_selector, GTK_TYPE_TABLE)
 
 static void
 e_meeting_time_selector_class_init (EMeetingTimeSelectorClass * klass)
@@ -267,11 +267,9 @@ e_meeting_time_selector_init (EMeetingTi
 void
 e_meeting_time_selector_construct (EMeetingTimeSelector * mts, EMeetingStore *ems)
 {
-	char *filename;
 	GtkWidget *hbox, *vbox, *separator, *label, *table, *sw;
 	GtkWidget *alignment, *child_hbox, *arrow, *menuitem;
 	GSList *group;
-	GdkVisual *visual;
 	GdkColormap *colormap;
 	guint accel_key;
 	time_t meeting_start_time;
@@ -319,8 +317,6 @@ e_meeting_time_selector_construct (EMeet
 
 
 	/* build the etable */
-	filename = g_build_filename (calendar_component_peek_config_directory (calendar_component_peek ()),
-				     "config", "et-header-meeting-time-sel", NULL);
 	mts->model = ems;
 
 	if (mts->model)
@@ -654,7 +650,6 @@ e_meeting_time_selector_construct (EMeet
 	gtk_table_set_row_spacing (GTK_TABLE (mts), 4, 12);
 
 	/* Allocate the colors. */
-	visual = gtk_widget_get_visual (GTK_WIDGET (mts));
 	colormap = gtk_widget_get_colormap (GTK_WIDGET (mts));
 	e_meeting_time_selector_alloc_named_color (mts, "gray75", &mts->bg_color);
 	e_meeting_time_selector_alloc_named_color (mts, "gray50", &mts->all_attendees_bg_color);
@@ -2051,12 +2046,10 @@ e_meeting_time_selector_recalc_date_form
 	gint max_date_width, longest_weekday_width, longest_month_width, width;
 	gint day, longest_weekday, month, longest_month;
 	gchar buffer[128];
-	PangoFontDescription *font_desc;
 	PangoContext *pango_context;
 	PangoLayout *layout;
 
 	/* Set up Pango prerequisites */
-	font_desc = gtk_widget_get_style (GTK_WIDGET (mts))->font_desc;
 	pango_context = gtk_widget_get_pango_context (GTK_WIDGET (mts));
 	layout = pango_layout_new (pango_context);
 
Index: gui/e-memo-table-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-memo-table-config.c,v
retrieving revision 1.1
diff -u -p -r1.1 e-memo-table-config.c
--- gui/e-memo-table-config.c	19 Oct 2005 11:39:33 -0000	1.1
+++ gui/e-memo-table-config.c	9 Jan 2006 10:27:41 -0000
@@ -30,7 +30,7 @@ struct _EMemoTableConfigPrivate {
 	GList *notifications;
 };
 
-G_DEFINE_TYPE (EMemoTableConfig, e_memo_table_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EMemoTableConfig, e_memo_table_config, G_TYPE_OBJECT)
 
 /* Property IDs */
 enum props {
@@ -42,10 +42,8 @@ static void
 e_memo_table_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	EMemoTableConfig *table_config;
-	EMemoTableConfigPrivate *priv;
 
 	table_config = E_MEMO_TABLE_CONFIG (object);
-	priv = table_config->priv;
 	
 	switch (property_id) {
 	case PROP_TABLE:
@@ -61,10 +59,8 @@ static void
 e_memo_table_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	EMemoTableConfig *table_config;
-	EMemoTableConfigPrivate *priv;
 
 	table_config = E_MEMO_TABLE_CONFIG (object);
-	priv = table_config->priv;
 	
 	switch (property_id) {
 	case PROP_TABLE:
@@ -80,9 +76,6 @@ static void
 e_memo_table_config_dispose (GObject *object)
 {
 	EMemoTableConfig *table_config = E_MEMO_TABLE_CONFIG (object);
-	EMemoTableConfigPrivate *priv;
-	
-	priv = table_config->priv;
 
 	e_memo_table_config_set_table (table_config, NULL);
 	
Index: gui/e-memo-table.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-memo-table.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-memo-table.c
--- gui/e-memo-table.c	17 Dec 2005 13:36:29 -0000	1.3
+++ gui/e-memo-table.c	9 Jan 2006 10:27:41 -0000
@@ -109,17 +109,15 @@ static GdkPixbuf* icon_pixbufs[E_MEMO_MO
 
 static GdkAtom clipboard_atom = GDK_NONE;
 
-G_DEFINE_TYPE (EMemoTable, e_memo_table, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (EMemoTable, e_memo_table, GTK_TYPE_TABLE)
 
 
 static void
 e_memo_table_class_init (EMemoTableClass *klass)
 {
 	GtkObjectClass *object_class;
-	GtkWidgetClass *widget_class;
 
 	object_class = (GtkObjectClass *) klass;
-	widget_class = (GtkWidgetClass *) klass;
 
 	/* Method override */
 	object_class->destroy		= e_memo_table_destroy;
@@ -147,7 +145,7 @@ e_memo_table_class_init (EMemoTableClass
  * Also, this assumes it is passed pointers to ECalComponents, but I think it
  * may just be passed pointers to the 2 cell values.
  */
-/*
+#if 0
 static gint
 task_compare_cb (gconstpointer a, gconstpointer b)
 {
@@ -168,7 +166,7 @@ task_compare_cb (gconstpointer a, gconst
 		int v;
 
 		/* FIXME: TIMEZONES. But currently we have no way to get the
-		   ECal, so we can't get the timezone. *
+		   ECal, so we can't get the timezone. */
 		v = icaltime_compare (*due_a.value, *due_b.value);
 
 		if (v == 0)
@@ -193,7 +191,7 @@ task_compare_cb (gconstpointer a, gconst
 
 	return retval;
 }
-*/
+#endif
 
 static void
 row_appended_cb (ECalModel *model, EMemoTable *memo_table) 
Index: gui/e-memos.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-memos.c,v
retrieving revision 1.3
diff -u -p -r1.3 e-memos.c
--- gui/e-memos.c	26 Nov 2005 02:31:49 -0000	1.3
+++ gui/e-memos.c	9 Jan 2006 10:27:41 -0000
@@ -120,7 +120,7 @@ static const int num_list_drag_types = s
 
 static guint e_memos_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (EMemos, e_memos, GTK_TYPE_TABLE);
+G_DEFINE_TYPE (EMemos, e_memos, GTK_TYPE_TABLE)
 
 /* Callback used when the cursor changes in the table */
 static void
@@ -272,8 +272,6 @@ update_view (EMemos *memos)
 {
 	EMemosPrivate *priv;
 	ECalModel *model;
-	char *real_sexp = NULL;
-	char *new_sexp = NULL;
 	
 	priv = memos->priv;
 
@@ -717,12 +715,10 @@ static void
 backend_error_cb (ECal *client, const char *message, gpointer data)
 {
 	EMemos *memos;
-	EMemosPrivate *priv;
 	char *errmsg;
 	char *urinopwd;
 
 	memos = E_MEMOS (data);
-	priv = memos->priv;
 
 	urinopwd = get_uri_without_password (e_cal_get_uri (client));
 	errmsg = g_strdup_printf (_("Error on %s:\n %s"), urinopwd, message);
@@ -854,10 +850,6 @@ typedef void (*open_func) (ECal *, ECale
 static gboolean
 open_ecal (EMemos *memos, ECal *cal, gboolean only_if_exists, open_func of)
 {
-	EMemosPrivate *priv;
-
-	priv = memos->priv;
-	
 	set_status_message (memos, _("Opening memos at %s"), e_cal_get_uri (cal));
 
 	g_signal_connect (G_OBJECT (cal), "cal_opened", G_CALLBACK (of), memos);
Index: gui/e-mini-calendar-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-mini-calendar-config.c,v
retrieving revision 1.2
diff -u -p -r1.2 e-mini-calendar-config.c
--- gui/e-mini-calendar-config.c	14 Oct 2004 15:36:27 -0000	1.2
+++ gui/e-mini-calendar-config.c	9 Jan 2006 10:27:41 -0000
@@ -35,16 +35,14 @@ enum props {
 	PROP_CALENDAR
 };
 
-G_DEFINE_TYPE (EMiniCalendarConfig, e_mini_calendar_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EMiniCalendarConfig, e_mini_calendar_config, G_TYPE_OBJECT)
 
 static void
 e_mini_calendar_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	EMiniCalendarConfig *mini_config;
-	EMiniCalendarConfigPrivate *priv;
 
 	mini_config = E_MINI_CALENDAR_CONFIG (object);
-	priv = mini_config->priv;
 	
 	switch (property_id) {
 	case PROP_CALENDAR:
@@ -60,10 +58,8 @@ static void
 e_mini_calendar_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	EMiniCalendarConfig *mini_config;
-	EMiniCalendarConfigPrivate *priv;
 
 	mini_config = E_MINI_CALENDAR_CONFIG (object);
-	priv = mini_config->priv;
 	
 	switch (property_id) {
 	case PROP_CALENDAR:
@@ -79,10 +75,7 @@ static void
 e_mini_calendar_config_dispose (GObject *object)
 {
 	EMiniCalendarConfig *mini_config = E_MINI_CALENDAR_CONFIG (object);
-	EMiniCalendarConfigPrivate *priv;
 	
-	priv = mini_config->priv;
-
 	e_mini_calendar_config_set_calendar (mini_config, NULL);
 	
 	if (G_OBJECT_CLASS (e_mini_calendar_config_parent_class)->dispose)
Index: gui/e-pub-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-pub-utils.c,v
retrieving revision 1.9
diff -u -p -r1.9 e-pub-utils.c
--- gui/e-pub-utils.c	9 Nov 2005 09:06:42 -0000	1.9
+++ gui/e-pub-utils.c	9 Jan 2006 10:27:41 -0000
@@ -136,7 +136,7 @@ e_pub_uri_to_xml (EPublishUri *uri)
 static gboolean 
 is_publish_time (EPublishUri *uri) {
 	icaltimezone *utc;
-	struct icaltimetype current_itt, adjust_itt;
+	struct icaltimetype current_itt;
 
 	utc = icaltimezone_get_utc_timezone ();
 	current_itt = icaltime_current_time_with_zone (utc);		
@@ -191,7 +191,7 @@ e_pub_publish (gboolean publish) {
 	uri_config_list = calendar_config_get_free_busy ();
 
 	for (l = uri_config_list; l != NULL; l = l->next) {
-		GSList *p =NULL, *q;
+		GSList *p = NULL, *q;
 		EPublishUri *uri;
 		ECalComponent *clone = NULL;
 		gboolean cloned = FALSE;
@@ -206,7 +206,7 @@ e_pub_publish (gboolean publish) {
 		e_pub_uri_from_xml (uri, xml);
 	
 		/*FIXME this is just a hack to avoid publishing again and again 
-		  ,we need to make the last publish time a seperate key */
+		  we need to make the last publish time a seperate key */
 		if (updated_last_pub_time) {
 			updated_last_pub_time = FALSE;
 			return;
@@ -284,10 +284,10 @@ e_pub_publish (gboolean publish) {
 				if (e_cal_get_free_busy ((ECal *) client, users,
 							 start, end, 
 							 &comp_list, &error)) {
-					GList *l;
-	
-					for (l = comp_list; l; l = l->next) {
-						ECalComponent *comp = E_CAL_COMPONENT (l->data);
+					GList *list;
+
+					for (list = comp_list; list; list = list->next) {
+						ECalComponent *comp = E_CAL_COMPONENT (list->data);
 					
 						cloned = itip_publish_begin (comp, (ECal *) client, cloned, &clone);
 						g_object_unref (comp);
Index: gui/e-tasks.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-tasks.c,v
retrieving revision 1.128
diff -u -p -r1.128 e-tasks.c
--- gui/e-tasks.c	2 Jan 2006 09:49:25 -0000	1.128
+++ gui/e-tasks.c	9 Jan 2006 10:27:41 -0000
@@ -306,15 +306,12 @@ static void
 process_completed_tasks (ETasks *tasks, gboolean config_changed)
 {
 	ETasksPrivate *priv;
-	ECalModel *model;
 
 	g_return_if_fail (tasks != NULL);
 	g_return_if_fail (E_IS_TASKS (tasks));
 
 	priv = tasks->priv;
 
-	model = e_calendar_table_get_model (E_CALENDAR_TABLE (priv->tasks_view));
-
 	e_calendar_table_process_completed_tasks (e_tasks_get_calendar_table (tasks), priv->clients_list, config_changed);
 }
 
@@ -812,12 +809,10 @@ static void
 backend_error_cb (ECal *client, const char *message, gpointer data)
 {
 	ETasks *tasks;
-	ETasksPrivate *priv;
 	char *errmsg;
 	char *urinopwd;
 
 	tasks = E_TASKS (data);
-	priv = tasks->priv;
 
 	urinopwd = get_uri_without_password (e_cal_get_uri (client));
 	errmsg = g_strdup_printf (_("Error on %s:\n %s"), urinopwd, message);
Index: gui/e-timezone-entry.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-timezone-entry.c,v
retrieving revision 1.29
diff -u -p -r1.29 e-timezone-entry.c
--- gui/e-timezone-entry.c	8 Dec 2005 21:16:53 -0000	1.29
+++ gui/e-timezone-entry.c	9 Jan 2006 10:27:41 -0000
@@ -77,7 +77,7 @@ static void e_timezone_entry_set_entry  
 
 static guint timezone_entry_signals[LAST_SIGNAL] = { 0 };
 
-G_DEFINE_TYPE (ETimezoneEntry, e_timezone_entry, GTK_TYPE_HBOX);
+G_DEFINE_TYPE (ETimezoneEntry, e_timezone_entry, GTK_TYPE_HBOX)
 
 static void
 e_timezone_entry_class_init		(ETimezoneEntryClass	*class)
@@ -164,12 +164,10 @@ static void
 e_timezone_entry_destroy		(GtkObject	*object)
 {
 	ETimezoneEntry *tentry;
-	ETimezoneEntryPrivate *priv;
 
 	g_return_if_fail (E_IS_TIMEZONE_ENTRY (object));
 
 	tentry = E_TIMEZONE_ENTRY (object);
-	priv = tentry->priv;
 
 	g_free (tentry->priv);
 	tentry->priv = NULL;
Index: gui/e-week-view-config.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-config.c,v
retrieving revision 1.6
diff -u -p -r1.6 e-week-view-config.c
--- gui/e-week-view-config.c	14 Oct 2004 14:56:18 -0000	1.6
+++ gui/e-week-view-config.c	9 Jan 2006 10:27:41 -0000
@@ -36,16 +36,14 @@ enum props {
 	PROP_VIEW,
 };
 
-G_DEFINE_TYPE (EWeekViewConfig, e_week_view_config, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EWeekViewConfig, e_week_view_config, G_TYPE_OBJECT)
 
 static void
 e_week_view_config_set_property (GObject *object, guint property_id, const GValue *value, GParamSpec *pspec)
 {
 	EWeekViewConfig *view_config;
-	EWeekViewConfigPrivate *priv;
 
 	view_config = E_WEEK_VIEW_CONFIG (object);
-	priv = view_config->priv;
 	
 	switch (property_id) {
 	case PROP_VIEW:
@@ -61,10 +59,8 @@ static void
 e_week_view_config_get_property (GObject *object, guint property_id, GValue *value, GParamSpec *pspec)
 {
 	EWeekViewConfig *view_config;
-	EWeekViewConfigPrivate *priv;
 
 	view_config = E_WEEK_VIEW_CONFIG (object);
-	priv = view_config->priv;
 	
 	switch (property_id) {
 	case PROP_VIEW:
@@ -80,9 +76,6 @@ static void
 e_week_view_config_dispose (GObject *object)
 {
 	EWeekViewConfig *view_config = E_WEEK_VIEW_CONFIG (object);
-	EWeekViewConfigPrivate *priv;
-	
-	priv = view_config->priv;
 
 	e_week_view_config_set_view (view_config, NULL);
 	
Index: gui/e-week-view-event-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-event-item.c,v
retrieving revision 1.54
diff -u -p -r1.54 e-week-view-event-item.c
--- gui/e-week-view-event-item.c	17 Jun 2005 15:20:27 -0000	1.54
+++ gui/e-week-view-event-item.c	9 Jan 2006 10:27:41 -0000
@@ -95,7 +95,7 @@ enum {
 	ARG_SPAN_NUM
 };
 
-G_DEFINE_TYPE (EWeekViewEventItem, e_week_view_event_item, GNOME_TYPE_CANVAS_ITEM);
+G_DEFINE_TYPE (EWeekViewEventItem, e_week_view_event_item, GNOME_TYPE_CANVAS_ITEM)
 
 static void
 e_week_view_event_item_class_init (EWeekViewEventItemClass *class)
@@ -219,7 +219,6 @@ e_week_view_event_item_draw (GnomeCanvas
 	EWeekView *week_view;
 	EWeekViewEvent *event;
 	EWeekViewEventSpan *span;
-	GtkStyle *style;
 	GdkGC *gc;
 	gint x1, y1, x2, y2, time_x, time_y;
 	gint icon_x, icon_y, time_width, min_end_time_x, max_icon_x;
@@ -253,7 +252,6 @@ e_week_view_event_item_draw (GnomeCanvas
 	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
 			       event->spans_index + wveitem->span_num);
 
-	style = GTK_WIDGET (week_view)->style;
 	gc = week_view->main_gc;
 
 	x1 = canvas_item->x1 - x;
@@ -591,7 +589,6 @@ e_week_view_event_item_draw_icons (EWeek
 {
 	EWeekView *week_view;
 	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
 	ECalComponent *comp;
 	GdkGC *gc;
 	gint num_icons = 0, icon_x_inc;
@@ -603,8 +600,6 @@ e_week_view_event_item_draw_icons (EWeek
 
 	event = &g_array_index (week_view->events, EWeekViewEvent,
 				wveitem->event_num);
-	span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-			       event->spans_index + wveitem->span_num);
 	comp = e_cal_component_new ();
 	e_cal_component_set_icalcomponent (comp, icalcomponent_new_clone (event->comp_data->icalcomp));
 
Index: gui/e-week-view-main-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-main-item.c,v
retrieving revision 1.21
diff -u -p -r1.21 e-week-view-main-item.c
--- gui/e-week-view-main-item.c	14 Oct 2004 14:56:18 -0000	1.21
+++ gui/e-week-view-main-item.c	9 Jan 2006 10:27:42 -0000
@@ -69,7 +69,7 @@ enum {
 	ARG_WEEK_VIEW
 };
 
-G_DEFINE_TYPE (EWeekViewMainItem, e_week_view_main_item, GNOME_TYPE_CANVAS_ITEM);
+G_DEFINE_TYPE (EWeekViewMainItem, e_week_view_main_item, GNOME_TYPE_CANVAS_ITEM)
 
 static void
 e_week_view_main_item_class_init (EWeekViewMainItemClass *class)
@@ -106,10 +106,8 @@ e_week_view_main_item_init (EWeekViewMai
 static void
 e_week_view_main_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 {
-	GnomeCanvasItem *item;
 	EWeekViewMainItem *wvmitem;
 
-	item = GNOME_CANVAS_ITEM (o);
 	wvmitem = E_WEEK_VIEW_MAIN_ITEM (o);
 	
 	switch (arg_id){
Index: gui/e-week-view-titles-item.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view-titles-item.c,v
retrieving revision 1.11
diff -u -p -r1.11 e-week-view-titles-item.c
--- gui/e-week-view-titles-item.c	14 Oct 2004 14:56:18 -0000	1.11
+++ gui/e-week-view-titles-item.c	9 Jan 2006 10:27:42 -0000
@@ -59,7 +59,7 @@ enum {
 	ARG_WEEK_VIEW
 };
 
-G_DEFINE_TYPE (EWeekViewTitlesItem, e_week_view_titles_item, GNOME_TYPE_CANVAS_ITEM);
+G_DEFINE_TYPE (EWeekViewTitlesItem, e_week_view_titles_item, GNOME_TYPE_CANVAS_ITEM)
 
 static void
 e_week_view_titles_item_class_init (EWeekViewTitlesItemClass *class)
@@ -93,10 +93,8 @@ e_week_view_titles_item_init (EWeekViewT
 static void
 e_week_view_titles_item_set_arg (GtkObject *o, GtkArg *arg, guint arg_id)
 {
-	GnomeCanvasItem *item;
 	EWeekViewTitlesItem *wvtitem;
 
-	item = GNOME_CANVAS_ITEM (o);
 	wvtitem = E_WEEK_VIEW_TITLES_ITEM (o);
 	
 	switch (arg_id){
@@ -139,7 +137,7 @@ e_week_view_titles_item_draw (GnomeCanva
 	EWeekViewTitlesItem *wvtitem;
 	EWeekView *week_view;
 	GtkStyle *style;
-	GdkGC *fg_gc, *bg_gc, *light_gc, *dark_gc;
+	GdkGC *fg_gc, *light_gc, *dark_gc;
 	gint canvas_width, canvas_height, col_width, col, date_width, date_x;
 	gchar buffer[128], *date_format;
 	GDate date;
@@ -159,7 +157,6 @@ e_week_view_titles_item_draw (GnomeCanva
 
 	style = gtk_widget_get_style (GTK_WIDGET (week_view));
 	fg_gc = style->fg_gc[GTK_STATE_NORMAL];
-	bg_gc = style->bg_gc[GTK_STATE_NORMAL];
 	light_gc = style->light_gc[GTK_STATE_NORMAL];
 	dark_gc = style->dark_gc[GTK_STATE_NORMAL];
 	canvas_width = GTK_WIDGET (canvas_item->canvas)->allocation.width;
Index: gui/e-week-view.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/e-week-view.c,v
retrieving revision 1.253
diff -u -p -r1.253 e-week-view.c
--- gui/e-week-view.c	2 Jan 2006 14:12:41 -0000	1.253
+++ gui/e-week-view.c	9 Jan 2006 10:27:42 -0000
@@ -168,9 +168,6 @@ static gboolean e_week_view_find_event_f
 typedef gboolean (* EWeekViewForeachEventCallback) (EWeekView *week_view,
 						    gint event_num,
 						    gpointer data);
-static void e_week_view_foreach_event (EWeekView *week_view, 
-				       EWeekViewForeachEventCallback callback,
-				       gpointer data);
 static void e_week_view_foreach_event_with_uid (EWeekView *week_view,
 						const gchar *uid,
 						EWeekViewForeachEventCallback callback,
@@ -188,7 +185,6 @@ static gboolean e_week_view_on_jump_butt
 static gboolean e_week_view_key_press (GtkWidget *widget, GdkEventKey *event);
 static gboolean e_week_view_do_key_press (GtkWidget *widget,
 					  GdkEventKey *event);
-static void e_week_view_move_selection_day (EWeekView *week_view, ECalViewMoveDirection direction);
 static gint e_week_view_get_adjust_days_for_move_up (EWeekView *week_view, gint
 current_day);
 static gint e_week_view_get_adjust_days_for_move_down (EWeekView *week_view,gint current_day);
@@ -196,9 +192,6 @@ static gint e_week_view_get_adjust_days_
 static gint e_week_view_get_adjust_days_for_move_right (EWeekView *week_view,gint current_day);
 static gboolean e_week_view_popup_menu (GtkWidget *widget);
 
-static gboolean e_week_view_update_event_cb (EWeekView *week_view,
-					     gint event_num,
-					     gpointer data);
 static gboolean e_week_view_remove_event_cb (EWeekView *week_view,
 					     gint event_num,
 					     gpointer data);
@@ -208,7 +201,7 @@ static void e_week_view_queue_layout (EW
 static void e_week_view_cancel_layout (EWeekView *week_view);
 static gboolean e_week_view_layout_timeout_cb (gpointer data);
 
-G_DEFINE_TYPE (EWeekView, e_week_view, E_TYPE_CALENDAR_VIEW);
+G_DEFINE_TYPE (EWeekView, e_week_view, E_TYPE_CALENDAR_VIEW)
 
 static void
 e_week_view_class_init (EWeekViewClass *class)
@@ -306,9 +299,9 @@ time_range_changed_cb (ECalModel *model,
 static void
 process_component (EWeekView *week_view, ECalModelComponent *comp_data)
 {
-	gint num_days;
 	ECalComponent *comp = NULL;
 	AddEventData add_event_data;
+	/* rid is never used in this function? */
 	const char *uid, *rid;
 
 	/* If we don't have a valid date set yet, just return. */
@@ -330,8 +323,6 @@ process_component (EWeekView *week_view,
 		rid = NULL;
 
 	/* Add the object */
-	num_days = week_view->multi_week_view ? week_view->weeks_shown * 7 : 7;
-
 	add_event_data.week_view = week_view;
 	add_event_data.comp_data = comp_data;
 	e_week_view_add_event (comp, comp_data->instance_start, comp_data->instance_end, FALSE, &add_event_data);
@@ -1803,6 +1794,7 @@ e_week_view_recalc_display_start_day	(EW
 	return FALSE;
 }
 
+#if 0
 /*  Checks if the users participation status is Needs action and shows the summary as bold text*/
 static void
 set_text_as_bold (EWeekViewEvent *event, EWeekViewEventSpan *span)
@@ -1836,66 +1828,7 @@ set_text_as_bold (EWeekViewEvent *event,
 	g_object_unref (comp);
 	g_free (address);
 }
-
-static gboolean
-e_week_view_update_event_cb (EWeekView *week_view,
-			     gint event_num,
-			     gpointer data)
-{
-	EWeekViewEvent *event;
-	EWeekViewEventSpan *span;
-	gint span_num;
-	const gchar *text;
-	ECalModelComponent *comp_data;
-
-	comp_data = data;
-
-	event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-	e_cal_model_free_component_data (event->comp_data);
-	event->comp_data = e_cal_model_copy_component_data (comp_data);
-
-	for (span_num = 0; span_num < event->num_spans; span_num++) {
-		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + span_num);
-
-		if (span->text_item) {
-			text = icalcomponent_get_summary (comp_data->icalcomp);
-			gnome_canvas_item_set (span->text_item,
-					       "text", text ? text : "",
-					       NULL);	    
-
-			e_week_view_reshape_event_span (week_view, event_num,
-							span_num);
-		}
-	}
-	g_signal_emit_by_name (G_OBJECT(week_view),
-                              "event_changed", event);
-
-
-	return TRUE;
-}
-
-/* This calls a given function for each event instance Note that it is
-   safe for the callback to remove the event (since we step backwards
-   through the arrays). */
-static void
-e_week_view_foreach_event (EWeekView *week_view, 
-			   EWeekViewForeachEventCallback callback,
-			   gpointer data)
-{
-	EWeekViewEvent *event;
-	gint event_num;
-
-	for (event_num = week_view->events->len - 1;
-	     event_num >= 0;
-	     event_num--) {
-		event = &g_array_index (week_view->events, EWeekViewEvent, event_num);
-
-		if (!(*callback) (week_view, event_num, data))
-			return;
-	}
-}
+#endif
 
 /* This calls a given function for each event instance that matches the given
    uid. Note that it is safe for the callback to remove the event (since we
@@ -2562,7 +2495,7 @@ tooltip_get_view_event (EWeekView *week_
 static void
 tooltip_destroy (EWeekView *week_view, GnomeCanvasItem *item)
 {
-	int event_num = GPOINTER_TO_INT (g_object_get_data (item, "event-num"));
+	int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 	EWeekViewEvent *pevent;
 
 	pevent = tooltip_get_view_event (week_view, -1, event_num);
@@ -2584,7 +2517,7 @@ tooltip_event_cb (GnomeCanvasItem *item,
    	          GdkEvent *event,
 		  EWeekView *view)
 {
-	int event_num = GPOINTER_TO_INT (g_object_get_data (item, "event-num"));
+	int event_num = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 	EWeekViewEvent *pevent;
 	
 	pevent = tooltip_get_view_event (view, -1, event_num);
@@ -2624,8 +2557,6 @@ tooltip_event_cb (GnomeCanvasItem *item,
 		default:
 			return FALSE;
 	}
-
-	return FALSE;
 }
 
 static void
@@ -2722,7 +2653,7 @@ e_week_view_reshape_event_span (EWeekVie
 					       NULL);
 	}
 	
-	g_object_set_data ((GObject *)span->background_item, "event-num", event_num);
+	g_object_set_data ((GObject *)span->background_item, "event-num", GINT_TO_POINTER (event_num));
 	g_signal_connect (span->background_item, "event",
 			  G_CALLBACK (tooltip_event_cb),
 			  week_view);
@@ -2734,11 +2665,11 @@ e_week_view_reshape_event_span (EWeekVie
 
 	/* Create the text item if necessary. */
 	if (!span->text_item) {
-		ECalComponentText text;
+		ECalComponentText cal_text;
 		GtkWidget *widget;
 
 		widget = (GtkWidget *)week_view;
-		e_cal_component_get_summary (comp, &text);
+		e_cal_component_get_summary (comp, &cal_text);
 		span->text_item =
 			gnome_canvas_item_new (GNOME_CANVAS_GROUP (GNOME_CANVAS (week_view->main_canvas)->root),
 					       e_text_get_type (),
@@ -2746,7 +2677,7 @@ e_week_view_reshape_event_span (EWeekVie
 					       "clip", TRUE,
 					       "max_lines", 1,
 					       "editable", TRUE,
-					       "text", text.value ? text.value : "",
+					       "text", cal_text.value ? cal_text.value : "",
 					       "use_ellipsis", TRUE,
 					       "fill_color_gdk", &widget->style->text[GTK_STATE_NORMAL],
 					       "im_context", E_CANVAS (week_view->main_canvas)->im_context,
@@ -2757,7 +2688,7 @@ e_week_view_reshape_event_span (EWeekVie
 				&& e_cal_util_component_has_attendee (event->comp_data->icalcomp)) {
 			set_text_as_bold (event, span);
 		} */
-		g_object_set_data ((GObject *)span->text_item, "event-num", event_num);		
+		g_object_set_data (G_OBJECT (span->text_item), "event-num", GINT_TO_POINTER (event_num));		
 		g_signal_connect (span->text_item, "event",
 				  G_CALLBACK (e_week_view_on_text_item_event),
 				  week_view);
@@ -3026,7 +2957,7 @@ e_week_view_on_text_item_event (GnomeCan
 {
 	EWeekViewEvent *event;
 	gint event_num, span_num;
-	int nevent = GPOINTER_TO_INT (g_object_get_data (item, "event-num"));
+	int nevent = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (item), "event-num"));
 	EWeekViewEvent *pevent;
 	
 	pevent = tooltip_get_view_event (week_view, -1, nevent);
@@ -3195,14 +3126,13 @@ e_week_view_on_text_item_event (GnomeCan
 static gboolean e_week_view_event_move (ECalendarView *cal_view, ECalViewMoveDirection direction)
 {
 	EWeekViewEvent *event;
-	gint event_num, span_num, adjust_days, current_start_day, current_end_day;
+	gint event_num, adjust_days, current_start_day, current_end_day;
 	time_t start_dt, end_dt;
 	struct icaltimetype start_time,end_time;
 	EWeekView *week_view = E_WEEK_VIEW (cal_view);
 	gboolean is_all_day = FALSE;
 
 	event_num = week_view->editing_event_num;
-	span_num = week_view->editing_span_num;
 	adjust_days = 0;
 
 	/* If no item is being edited, just return. */
@@ -3450,8 +3380,6 @@ e_week_view_on_editing_stopped (EWeekVie
 	on_server = cal_comp_is_on_server (comp, client);
 	
 	if (string_is_empty (text) && !on_server) {
-		const char *uid;
-		
 		e_cal_component_get_uid (comp, &uid);
 		
 		e_week_view_foreach_event_with_uid (week_view, uid,
@@ -3979,13 +3907,13 @@ e_week_view_do_key_press (GtkWidget *wid
 	gtk_widget_queue_draw (week_view->main_canvas);
 
 	if (e_week_view_find_event_from_uid (week_view, ecal, uid, NULL, &event_num)) {
-		EWeekViewEvent *event;
+		EWeekViewEvent *wvevent;
 		EWeekViewEventSpan *span;
 
-		event = &g_array_index (week_view->events, EWeekViewEvent,
-					event_num);
+		wvevent = &g_array_index (week_view->events, EWeekViewEvent,
+					  event_num);
 		span = &g_array_index (week_view->spans, EWeekViewEventSpan,
-				       event->spans_index + 0);
+				       wvevent->spans_index + 0);
 		
 		/* If the event can't be fit on the screen, don't try to edit it. */
 		if (!span->text_item) {
@@ -4006,58 +3934,6 @@ e_week_view_do_key_press (GtkWidget *wid
 	g_object_unref (comp);
 
 	return TRUE;
-}
-
-static void 
-e_week_view_move_selection_day (EWeekView *week_view, ECalViewMoveDirection direction)
-{
-	gint selection_start_day, selection_end_day;
- 
-	selection_start_day = week_view->selection_start_day;
-	selection_end_day = week_view->selection_end_day;
-
-	if (selection_start_day == -1) { 
-		selection_start_day = 0;	  
-		selection_end_day = 0;
-	}
-		
-       switch (direction) {
-       case E_CAL_VIEW_MOVE_UP:
-               selection_end_day += e_week_view_get_adjust_days_for_move_up (week_view,selection_end_day);
-               break;
-       case E_CAL_VIEW_MOVE_DOWN:
-               selection_end_day += e_week_view_get_adjust_days_for_move_down (week_view,selection_end_day);
-               break;
-       case E_CAL_VIEW_MOVE_LEFT:
-               selection_end_day += e_week_view_get_adjust_days_for_move_left (week_view,selection_end_day);
-               break;
-       case E_CAL_VIEW_MOVE_RIGHT:
-               selection_end_day += e_week_view_get_adjust_days_for_move_right (week_view,selection_end_day);
-               break;
-       default:
-               break;
-       }
-       if (selection_end_day < 0) {
-               e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_UP);
-               selection_end_day +=7;
-       }
-       if (week_view->multi_week_view) {
-               if (selection_end_day >= week_view->weeks_shown * 7) {
-               e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_DOWN);
-               selection_end_day -=7;
-               }
-       }else {
-               if (selection_end_day >= 7) {
-                       e_week_view_scroll_a_step (week_view, E_CAL_VIEW_MOVE_DOWN);
-                       selection_end_day -=7;
-               }
-       }
-
-	week_view->selection_start_day = selection_end_day;
-	week_view->selection_end_day = selection_end_day;
-
-	gtk_widget_queue_draw (week_view->main_canvas);
-	g_signal_emit_by_name (week_view, "selected_time_changed");
 }
 
 static gint
Index: gui/gnome-cal.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/gnome-cal.c,v
retrieving revision 1.393
diff -u -p -r1.393 gnome-cal.c
--- gui/gnome-cal.c	26 Nov 2005 02:31:49 -0000	1.393
+++ gui/gnome-cal.c	9 Jan 2006 10:27:42 -0000
@@ -233,7 +233,7 @@ static void update_query (GnomeCalendar 
 
 static void update_todo_view (GnomeCalendar *gcal);
 
-G_DEFINE_TYPE (GnomeCalendar, gnome_calendar, GTK_TYPE_VBOX);
+G_DEFINE_TYPE (GnomeCalendar, gnome_calendar, GTK_TYPE_VBOX)
 
 /* Class initialization function for the gnome calendar */
 static void
@@ -504,10 +504,8 @@ static void
 dn_e_cal_view_objects_modified_cb (ECalView *query, GList *objects, gpointer data)
 {
 	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
 
 	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
 
 	/* We have to retag the whole thing: an event may change dates
 	 * and the tag_calendar_by_comp() below would not know how to
@@ -532,10 +530,6 @@ dn_e_cal_view_objects_removed_cb (ECalVi
 static void
 dn_e_cal_view_done_cb (ECalView *query, ECalendarStatus status, gpointer data)
 {
-	GnomeCalendar *gcal;
-
-	gcal = GNOME_CALENDAR (data);
-
 	/* FIXME Better error reporting */
 	if (status != E_CALENDAR_STATUS_OK)
 		g_warning (G_STRLOC ": Query did not successfully complete");
@@ -1030,11 +1024,9 @@ static void
 table_selection_change_cb (ETable *etable, gpointer data)
 {
 	GnomeCalendar *gcal;
-	int n_selected;
 
 	gcal = GNOME_CALENDAR (data);
 
-	n_selected = e_table_selected_count (etable);
 	gtk_signal_emit (GTK_OBJECT (gcal), gnome_calendar_signals[TASKPAD_SELECTION_CHANGED]);
 }
 
@@ -1773,14 +1765,10 @@ gnome_calendar_goto_date (GnomeCalendar 
 void
 gnome_calendar_goto (GnomeCalendar *gcal, time_t new_time)
 {
-	GnomeCalendarPrivate *priv;
-	
 	g_return_if_fail (gcal != NULL);
 	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
 	g_return_if_fail (new_time != -1);
 
-	priv = gcal->priv;
-
 	update_view_times (gcal, new_time);
 	gnome_calendar_update_date_navigator (gcal);
 	gnome_calendar_notify_dates_shown_changed (gcal);
@@ -1876,10 +1864,6 @@ gnome_calendar_dayjump (GnomeCalendar *g
 static void
 focus_current_view (GnomeCalendar *gcal)
 {
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
 	gtk_widget_grab_focus (gnome_calendar_get_current_view_widget (gcal));
 }
 
@@ -2554,12 +2538,10 @@ static void
 backend_error_cb (ECal *client, const char *message, gpointer data)
 {
 	GnomeCalendar *gcal;
-	GnomeCalendarPrivate *priv;
 	char *errmsg;
 	char *uristr;
 
 	gcal = GNOME_CALENDAR (data);
-	priv = gcal->priv;
 
 	uristr = get_uri_without_password (e_cal_get_uri (client));
 	errmsg = g_strdup_printf (_("Error on %s:\n %s"), uristr, message);
@@ -2908,10 +2890,6 @@ gnome_calendar_set_selected_time_range (
 					time_t	       start_time,
 					time_t	       end_time)
 {
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
 	update_view_times (gcal, start_time);
 	gnome_calendar_update_date_navigator (gcal);
 	gnome_calendar_notify_dates_shown_changed (gcal);
@@ -2994,10 +2972,6 @@ gnome_calendar_get_current_time_range (G
 				       time_t	 *start_time,
 				       time_t	 *end_time)
 {
-	GnomeCalendarPrivate *priv;
-
-	priv = gcal->priv;
-
 	e_calendar_view_get_selected_time_range (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)),
 					    start_time, end_time);
 }
@@ -3010,13 +2984,10 @@ gnome_calendar_get_visible_time_range (G
 				       time_t	 *start_time,
 				       time_t	 *end_time)
 {
-	GnomeCalendarPrivate *priv;
 	gboolean retval = FALSE;
 
 	g_return_val_if_fail (GNOME_IS_CALENDAR (gcal), FALSE);
 
-	priv = gcal->priv;
-
 	retval = e_calendar_view_get_visible_time_range (E_CALENDAR_VIEW (gnome_calendar_get_current_view_widget (gcal)),
 						    start_time, end_time);
 
@@ -3399,13 +3370,10 @@ gnome_calendar_delete_selection		(GnomeC
 void
 gnome_calendar_delete_selected_occurrence (GnomeCalendar *gcal)
 {
-	GnomeCalendarPrivate *priv;
 	FocusLocation location;
 	GtkWidget *view;
 
 	g_return_if_fail (GNOME_IS_CALENDAR (gcal));
-
-	priv = gcal->priv;
 
 	location = get_focus_location (gcal);
 
Index: gui/goto.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/goto.c,v
retrieving revision 1.44
diff -u -p -r1.44 goto.c
--- gui/goto.c	26 Nov 2005 02:31:50 -0000	1.44
+++ gui/goto.c	9 Jan 2006 10:27:42 -0000
@@ -200,7 +200,6 @@ goto_dialog_init_widgets (GoToDialog *dl
 void
 goto_dialog (GnomeCalendar *gcal)
 {
-	GtkWidget *menu;
 	time_t start_time;
 	struct icaltimetype tt;
 	int b;
@@ -237,7 +236,6 @@ goto_dialog (GnomeCalendar *gcal)
 	dlg->month_val = tt.month - 1;
 	dlg->day_val = tt.day;
 
-	menu = gtk_option_menu_get_menu (GTK_OPTION_MENU (dlg->month));
 	gtk_option_menu_set_history (GTK_OPTION_MENU (dlg->month), dlg->month_val);
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (dlg->year), dlg->year_val);
 	
Index: gui/itip-utils.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/itip-utils.c,v
retrieving revision 1.109
diff -u -p -r1.109 itip-utils.c
--- gui/itip-utils.c	25 Nov 2005 04:12:04 -0000	1.109
+++ gui/itip-utils.c	9 Jan 2006 10:27:42 -0000
@@ -1337,7 +1337,7 @@ comp_fb_normalize (icalcomponent *icomp)
 	}
 	
 	return iclone;
-
+	/* this will never be reached */
 	g_object_unref (iclone);
 	return NULL;
 }
Index: gui/memos-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/memos-component.c,v
retrieving revision 1.3
diff -u -p -r1.3 memos-component.c
--- gui/memos-component.c	21 Dec 2005 07:18:48 -0000	1.3
+++ gui/memos-component.c	9 Jan 2006 10:27:42 -0000
@@ -902,12 +902,9 @@ static gboolean
 create_new_memo (MemosComponent *memo_component, gboolean is_assigned, MemosComponentView *component_view)
 {
 	ECal *ecal;
-	MemosComponentPrivate *priv;
 	ECalComponent *comp;
 	MemoEditor *editor;
 	
-	priv = memo_component->priv;
-	
 	ecal = setup_create_ecal (memo_component, component_view);
 	if (!ecal)
 		return FALSE;
@@ -1178,9 +1175,6 @@ impl_requestCreateItem (PortableServer_S
 			CORBA_Environment *ev)
 {
 	MemosComponent *memos_component = MEMOS_COMPONENT (bonobo_object_from_servant (servant));
-	MemosComponentPrivate *priv;
-	
-	priv = memos_component->priv;	
 	
 	if (strcmp (item_type_name, CREATE_MEMO_ID) == 0) {
 		if (!create_new_memo (memos_component, FALSE, NULL))
Index: gui/migration.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/migration.c,v
retrieving revision 1.39
diff -u -p -r1.39 migration.c
--- gui/migration.c	8 Jan 2006 21:23:07 -0000	1.39
+++ gui/migration.c	9 Jan 2006 10:27:43 -0000
@@ -1125,7 +1125,7 @@ migrate_memos (MemosComponent *component
 
 	e_source_list_sync (memos_component_peek_source_list (component), NULL);
 	retval = TRUE;
-fail:
+
 	if (on_this_computer)
 		g_object_unref (on_this_computer);
 	if (on_the_web)
Index: gui/print.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/print.c,v
retrieving revision 1.78
diff -u -p -r1.78 print.c
--- gui/print.c	6 Jan 2006 15:08:37 -0000	1.78
+++ gui/print.c	9 Jan 2006 10:27:43 -0000
@@ -559,7 +559,6 @@ print_month_small (GnomePrintContext *pc
 		   int bordertitle)
 {
 	icaltimezone *zone = calendar_config_get_icaltimezone ();
-	ECal *client;
 	GnomeFont *font, *font_bold, *font_normal;
 	time_t now, next;
 	int x, y;
@@ -587,8 +586,6 @@ print_month_small (GnomePrintContext *pc
 
 	top -= header_size;
 
-	client = gnome_calendar_get_default_client (gcal);
-
 	col_width = (right - left) / 7;
 
 	/* The top row with the day abbreviations gets an extra bit of
@@ -603,6 +600,7 @@ print_month_small (GnomePrintContext *pc
 	   twice as high as they are wide, but we need to fit two characters
 	   into each cell, so we don't want to go over col_width. */
 	max_font_size = col_width * 0.65;
+	/* Why calculate this if we're not using it? */
 
 	font_size = row_height;
 
@@ -1187,7 +1185,6 @@ print_day_details (GnomePrintContext *pc
 
 	/* Also print events outside of work hours */
 	if (pdi.events[0]->len > 0) {
-		icaltimezone *zone = calendar_config_get_icaltimezone ();
 		struct icaltimetype tt;
 
 		event = &g_array_index (pdi.events[0], EDayViewEvent, 0);		
@@ -1807,7 +1804,6 @@ print_todo_details (GnomePrintContext *p
 		    time_t start, time_t end,
 		    double left, double right, double top, double bottom)
 {
-	ECal *client;
 	GnomeFont *font_summary;
 	double y, yend, x, xend;
 	struct icaltimetype *tt;
@@ -1821,7 +1817,6 @@ print_todo_details (GnomePrintContext *p
 	task_pad = gnome_calendar_get_task_pad (gcal);
 	table = e_calendar_table_get_table (task_pad);
 	model = e_calendar_table_get_model (task_pad);
-	client = e_cal_model_get_default_client (model);
 
 	font_summary = get_font_for_size (10, GNOME_FONT_BOOK, FALSE);
 
@@ -2379,28 +2374,28 @@ print_comp_item (GnomePrintContext *pc, 
 			}
 
 			if (status_string) {
-				char *text = g_strdup_printf (_("Status: %s"),
+				char *status_text = g_strdup_printf (_("Status: %s"),
 							      status_string);
-				top = bound_text (pc, font, text,
+				top = bound_text (pc, font, status_text,
 						  left, right, top, bottom, 0);
 				top += gnome_font_get_size (font) - 6;
-				g_free (text);
+				g_free (status_text);
 			}
 		}
 
 		/* Priority */
 		e_cal_component_get_priority (comp, &priority);
 		if (priority && *priority >= 0) {
-			char *priority_string, *text;
+			char *priority_string, *pri_text;
 
 			priority_string = e_cal_util_priority_to_string (*priority);
 			e_cal_component_free_priority (priority);
 
-			text = g_strdup_printf (_("Priority: %s"), priority_string);
-			top = bound_text (pc, font, text,
+			pri_text = g_strdup_printf (_("Priority: %s"), priority_string);
+			top = bound_text (pc, font, pri_text,
 					  left, right, top, bottom, 0);
 			top += gnome_font_get_size (font) - 6;
-			g_free (text);
+			g_free (pri_text);
 		}
 
 		/* Percent Complete */
Index: gui/tasks-component.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/tasks-component.c,v
retrieving revision 1.95
diff -u -p -r1.95 tasks-component.c
--- gui/tasks-component.c	21 Dec 2005 07:18:48 -0000	1.95
+++ gui/tasks-component.c	9 Jan 2006 10:27:43 -0000
@@ -908,13 +908,10 @@ static gboolean
 create_new_todo (TasksComponent *task_component, gboolean is_assigned, TasksComponentView *component_view)
 {
 	ECal *ecal;
-	TasksComponentPrivate *priv;
 	ECalComponent *comp;
 	TaskEditor *editor;
 	guint32 flags = 0;	
 	
-	priv = task_component->priv;
-	
 	ecal = setup_create_ecal (task_component, component_view);
 	if (!ecal)
 		return FALSE;
@@ -1201,9 +1198,6 @@ impl_requestCreateItem (PortableServer_S
 			CORBA_Environment *ev)
 {
 	TasksComponent *tasks_component = TASKS_COMPONENT (bonobo_object_from_servant (servant));
-	TasksComponentPrivate *priv;
-	
-	priv = tasks_component->priv;	
 	
 	if (strcmp (item_type_name, CREATE_TASK_ID) == 0) {
 		if (!create_new_todo (tasks_component, FALSE, NULL))
Index: gui/weekday-picker.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/weekday-picker.c,v
retrieving revision 1.20
diff -u -p -r1.20 weekday-picker.c
--- gui/weekday-picker.c	13 Jan 2005 03:07:29 -0000	1.20
+++ gui/weekday-picker.c	9 Jan 2006 10:27:43 -0000
@@ -78,7 +78,7 @@ static void colorize_items (WeekdayPicke
 
 static guint wp_signals[LAST_SIGNAL];
 
-G_DEFINE_TYPE (WeekdayPicker, weekday_picker, GNOME_TYPE_CANVAS);
+G_DEFINE_TYPE (WeekdayPicker, weekday_picker, GNOME_TYPE_CANVAS)
 
 /* Class initialization function for the weekday picker */
 static void
Index: gui/alarm-notify/alarm-notify-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-notify-dialog.c,v
retrieving revision 1.42
diff -u -p -r1.42 alarm-notify-dialog.c
--- gui/alarm-notify/alarm-notify-dialog.c	5 Jan 2006 07:24:00 -0000	1.42
+++ gui/alarm-notify/alarm-notify-dialog.c	9 Jan 2006 10:27:43 -0000
@@ -351,7 +351,8 @@ add_alarm_to_notified_alarms_dialog (Ala
 	AlarmFuncInfo *funcinfo = NULL;
 	gchar *to_display = NULL, *start, *end, *str_time;
 	icaltimezone *current_zone;
-	
+
+	/* Iter is not yet defined but still we return it in all the g_return_val_if_fail() calls? */
 	g_return_val_if_fail (trigger != -1, iter);
 
 	/* Only VEVENTs or VTODOs can have alarms */
Index: gui/alarm-notify/alarm-queue.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm-queue.c,v
retrieving revision 1.92
diff -u -p -r1.92 alarm-queue.c
--- gui/alarm-notify/alarm-queue.c	17 Dec 2005 13:48:18 -0000	1.92
+++ gui/alarm-notify/alarm-queue.c	9 Jan 2006 10:27:43 -0000
@@ -289,8 +289,7 @@ remove_queued_alarm (CompQueuedAlarms *c
 	if (!l)
 		return;
 
-	cqa->queued_alarms = g_slist_remove_link (cqa->queued_alarms, l);
-	g_slist_free_1 (l);
+	cqa->queued_alarms = g_slist_delete_link (cqa->queued_alarms, l);
 
 	if (remove_alarm) {
 		cqa->expecting_update = TRUE;
@@ -991,12 +990,9 @@ open_alarm_dialog (TrayIconData *tray_da
 		if (alarm_notifications_dialog) {
 
 			GtkTreeSelection *selection = NULL;
-			GtkTreeModel *model = NULL;
 			
 			selection = gtk_tree_view_get_selection (
 				GTK_TREE_VIEW (alarm_notifications_dialog->treeview));
-			model = gtk_tree_view_get_model (
-				GTK_TREE_VIEW(alarm_notifications_dialog->treeview));
 		
 			tray_data->iter = add_alarm_to_notified_alarms_dialog (
 								   alarm_notifications_dialog,
@@ -1052,6 +1048,7 @@ menu_item_toggle_callback (GtkToggleButt
 		/* Browse the list of calendars for the newly added calendar*/
 		groups = e_source_list_peek_groups (all_cal);
 		for (p = groups; p != NULL; p = p->next) {
+			/* Reuse ESourceGroup *group; from above? */
 			ESourceGroup *group = E_SOURCE_GROUP (p->data);
 			ESource *sel_source = e_source_group_peek_source_by_uid (group, uid);
 
@@ -1060,10 +1057,10 @@ menu_item_toggle_callback (GtkToggleButt
 				grp_name = e_source_group_peek_name (sel_group);
 				/* You have got the group name*/
 				break;
-	}
-}
+			}
+		}
 
-		/* Add the source the the group name in the alarms calendar list*/
+		/* Add the source of the group name in the alarms calendar list*/
 		group = e_source_list_peek_group_by_name (selected_cal, grp_name);	
 		del_source = e_source_group_peek_source_by_uid (group, uid);
 		
@@ -1157,16 +1154,15 @@ populate ()
 
 		for (q = e_source_group_peek_sources (group); q != NULL; q = q->next) {
 			ESource *source = E_SOURCE (q->data);
-			GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
-			GtkWidget *item = gtk_check_button_new_with_label (e_source_peek_name (source));
+			GtkWidget *button = gtk_check_button_new_with_label (e_source_peek_name (source));
 
-			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(item), e_source_list_peek_source_by_uid (selected_cal, e_source_peek_uid (source)) ? TRUE:FALSE);
+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), e_source_list_peek_source_by_uid (selected_cal, e_source_peek_uid (source)) ? TRUE:FALSE);
 			
-			gtk_box_pack_start ((GtkBox *)hbox, item, FALSE, FALSE, 24);
-			gtk_object_set_data_full (GTK_OBJECT (item), "ESourceMenu", source,
+			gtk_box_pack_start ((GtkBox *)hbox, button, FALSE, FALSE, 24);
+			gtk_object_set_data_full (GTK_OBJECT (button), "ESourceMenu", source,
 						  (GtkDestroyNotify) g_object_unref);
 
-			g_signal_connect (item, "toggled", G_CALLBACK (menu_item_toggle_callback), source);
+			g_signal_connect (button, "toggled", G_CALLBACK (menu_item_toggle_callback), source);
 
 			gtk_box_pack_start (GTK_BOX(box), hbox, FALSE, FALSE, 2);
 			gtk_widget_show_all (hbox);
Index: gui/alarm-notify/alarm.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/alarm.c,v
retrieving revision 1.34
diff -u -p -r1.34 alarm.c
--- gui/alarm-notify/alarm.c	8 Nov 2005 08:47:49 -0000	1.34
+++ gui/alarm-notify/alarm.c	9 Jan 2006 10:27:43 -0000
@@ -61,8 +61,7 @@ pop_alarm (void)
 	ar = alarms->data;
 
 	l = alarms;
-	alarms = g_list_remove_link (alarms, l);
-	g_list_free_1 (l);
+	alarms = g_list_delete_link (alarms, l);
 
 	g_free (ar);
 }
@@ -246,8 +245,7 @@ alarm_remove (gpointer alarm)
 		ar = &ar_copy;
 		pop_alarm (); /* This will free the original AlarmRecord; that's why we copy it */
 	} else {
-		alarms = g_list_remove_link (alarms, l);
-		g_list_free_1 (l);
+		alarms = g_list_delete_link (alarms, l);
 	}
 
 	/* Reset the timeout */
Index: gui/alarm-notify/config-data.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/config-data.c,v
retrieving revision 1.13
diff -u -p -r1.13 config-data.c
--- gui/alarm-notify/config-data.c	24 Nov 2005 15:28:11 -0000	1.13
+++ gui/alarm-notify/config-data.c	9 Jan 2006 10:27:43 -0000
@@ -162,7 +162,7 @@ config_data_replace_string_list (const c
 
 			g_free (tmp->data);
 			tmp->data = g_strdup ((gchar *) new);
-
+			/* Should this be checked somewhere? */
 			state = gconf_client_set_list (conf_client,
 					       key,
 					       GCONF_VALUE_STRING,
Index: gui/dialogs/cal-attachment-select-file.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/cal-attachment-select-file.c,v
retrieving revision 1.1
diff -u -p -r1.1 cal-attachment-select-file.c
--- gui/dialogs/cal-attachment-select-file.c	8 Jan 2005 10:47:59 -0000	1.1
+++ gui/dialogs/cal-attachment-select-file.c	9 Jan 2006 10:27:43 -0000
@@ -191,9 +191,9 @@ comp_editor_select_file_attachments (Com
 	
 	if (selection) {
 #ifdef USE_GTKFILECHOOSER
-		GSList *files, *l, *n;
+		GSList *l, *n;
 		
-		if ((l = files = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (selection)))) {
+		if ((l = gtk_file_chooser_get_filenames (GTK_FILE_CHOOSER (selection)))) {
 			list = g_ptr_array_new ();
 			
 			while (l) {
Index: gui/dialogs/calendar-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/calendar-setup.c,v
retrieving revision 1.39
diff -u -p -r1.39 calendar-setup.c
--- gui/dialogs/calendar-setup.c	19 Oct 2005 11:39:34 -0000	1.39
+++ gui/dialogs/calendar-setup.c	9 Jan 2006 10:27:43 -0000
@@ -195,6 +195,7 @@ eccp_get_source_type (EConfig *ec, EConf
 		cell = gtk_cell_renderer_text_new ();
 		store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
 		for (l = sdialog->menu_source_groups; l; l = g_slist_next (l)) {
+			/* Reuse previously defined *group here? */
 			ESourceGroup *group = l->data;
 
 			gtk_list_store_append (store, &iter);
Index: gui/dialogs/comp-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/comp-editor.c,v
retrieving revision 1.160
diff -u -p -r1.160 comp-editor.c
--- gui/dialogs/comp-editor.c	20 Dec 2005 06:03:57 -0000	1.160
+++ gui/dialogs/comp-editor.c	9 Jan 2006 10:27:44 -0000
@@ -147,7 +147,7 @@ static void obj_modified_cb (ECal *clien
 static void obj_removed_cb (ECal *client, GList *uids, gpointer data);
 static gboolean open_attachment (EAttachmentBar *bar, CompEditor *editor);
 
-G_DEFINE_TYPE (CompEditor, comp_editor, BONOBO_TYPE_WINDOW);
+G_DEFINE_TYPE (CompEditor, comp_editor, BONOBO_TYPE_WINDOW)
 
 enum {
 	DND_TYPE_MESSAGE_RFC822,
@@ -521,13 +521,11 @@ comp_editor_class_init (CompEditorClass 
 {
 	GObjectClass *object_class;
 	GtkWidgetClass *widget_class;
-	GObjectClass *gobject_class;
 	int i;
 
 	for (i=0;i<sizeof(drag_info)/sizeof(drag_info[0]);i++)
 		drag_info[i].atom = gdk_atom_intern(drag_info[i].target, FALSE);
 
-	gobject_class = G_OBJECT_CLASS(klass);
 	object_class = G_OBJECT_CLASS (klass);
 	widget_class = GTK_WIDGET_CLASS (klass);
 
@@ -587,10 +585,6 @@ listen_for_changes (CompEditor *editor)
 static void
 commit_all_fields (CompEditor *editor)
 {
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
-
 	gtk_window_set_focus (GTK_WINDOW (editor), NULL);
 }
 
@@ -903,9 +897,6 @@ static int
 delete_event_cb (GtkWidget *widget, GdkEvent *event, gpointer data)
 {
 	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-	
-	priv = editor->priv;
 
 	commit_all_fields (editor);
 	
@@ -1187,9 +1178,6 @@ key_press_event(GtkWidget *widget, GdkEv
 static gint
 editor_key_press_event(GtkWidget *widget, GdkEventKey *event, CompEditor *editor)
 {
-        CompEditor *Editor = COMP_EDITOR (widget);
-	EAttachmentBar *bar = E_ATTACHMENT_BAR (Editor->priv->attachment_bar);
-
         if (event->keyval == GDK_Escape) {
 		commit_all_fields (editor);
 		
@@ -1210,7 +1198,7 @@ menu_file_save_cb (BonoboUIComponent *ui
 	CompEditor *editor = (CompEditor *) data;
 	CompEditorPrivate *priv = editor->priv;
 	ECalComponentText text;
-	gboolean delegated;
+	gboolean delegated = FALSE;
 	ECalComponent *comp;
 
 	if (e_attachment_bar_get_download_count (E_ATTACHMENT_BAR (editor->priv->attachment_bar)) ){
@@ -1256,9 +1244,6 @@ menu_file_close_cb (BonoboUIComponent *u
 		   const char *path)
 {
 	CompEditor *editor = (CompEditor *) data;
-	ECalComponent *comp;
-	ECalComponentText text;
-	CompEditorPrivate *priv = editor->priv;
 	
 	commit_all_fields (editor);
 
@@ -2113,10 +2098,8 @@ make_icon_from_comp (ECalComponent *comp
 	switch (type) {
 	case E_CAL_COMPONENT_EVENT:
 		return "stock_new-appointment";
-		break;
 	case E_CAL_COMPONENT_TODO:
 		return "stock_task";
-		break;
 	default:
 		return "stock_calendar";
 	}
@@ -2642,13 +2625,9 @@ raise_and_focus (GtkWidget *widget)
 void
 comp_editor_focus (CompEditor *editor)
 {
-	CompEditorPrivate *priv;
-
 	g_return_if_fail (editor != NULL);
 	g_return_if_fail (IS_COMP_EDITOR (editor));
 
-	priv = editor->priv;
-
 	gtk_widget_show (GTK_WIDGET (editor));
 	raise_and_focus (GTK_WIDGET (editor));
 }
@@ -2708,9 +2687,6 @@ static void
 needs_send_cb (GtkObject *obj, gpointer data)
 {
 	CompEditor *editor = COMP_EDITOR (data);
-	CompEditorPrivate *priv;
-
-	priv = editor->priv;
 
 	comp_editor_set_needs_send (editor, TRUE);
 }
Index: gui/dialogs/delete-comp.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/delete-comp.c,v
retrieving revision 1.26
diff -u -p -r1.26 delete-comp.c
--- gui/dialogs/delete-comp.c	16 May 2005 06:13:14 -0000	1.26
+++ gui/dialogs/delete-comp.c	9 Jan 2006 10:27:44 -0000
@@ -61,7 +61,7 @@ delete_component_dialog (ECalComponent *
 			 int n_comps, ECalComponentVType vtype,
 			 GtkWidget *widget)
 {
-	const char *stock_icon, *id;
+	const char *id;
 	char *arg0 = NULL;
 	int response;
 	
@@ -91,7 +91,6 @@ delete_component_dialog (ECalComponent *
 		
 		switch (vtype) {
 		case E_CAL_COMPONENT_EVENT:
-			stock_icon = "stock_calendar";
 			if (arg0)
 				id = "calendar:prompt-delete-titled-appointment";
 			else
@@ -99,7 +98,6 @@ delete_component_dialog (ECalComponent *
 			break;
 
 		case E_CAL_COMPONENT_TODO:
-			stock_icon = "stock_todo";
 			if (arg0)
 				id = "calendar:prompt-delete-named-task";
 			else
@@ -107,7 +105,6 @@ delete_component_dialog (ECalComponent *
 			break;
 
 		case E_CAL_COMPONENT_JOURNAL:
-			stock_icon = "stock_calendar";
 			if (arg0)
 				id = "calendar:prompt-delete-named-journal";
 			else
Index: gui/dialogs/e-delegate-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/e-delegate-dialog.c,v
retrieving revision 1.24
diff -u -p -r1.24 e-delegate-dialog.c
--- gui/dialogs/e-delegate-dialog.c	26 Nov 2005 02:31:51 -0000	1.24
+++ gui/dialogs/e-delegate-dialog.c	9 Jan 2006 10:27:44 -0000
@@ -60,7 +60,7 @@ static gboolean get_widgets			(EDelegate
 static void addressbook_clicked_cb              (GtkWidget *widget, gpointer data);
 static void addressbook_response_cb             (GtkWidget *widget, gint response, gpointer data);
 
-G_DEFINE_TYPE (EDelegateDialog, e_delegate_dialog, G_TYPE_OBJECT);
+G_DEFINE_TYPE (EDelegateDialog, e_delegate_dialog, G_TYPE_OBJECT)
 
 /* Class initialization function for the event editor */
 static void
Index: gui/dialogs/event-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-editor.c,v
retrieving revision 1.74
diff -u -p -r1.74 event-editor.c
--- gui/dialogs/event-editor.c	26 Nov 2005 02:31:51 -0000	1.74
+++ gui/dialogs/event-editor.c	9 Jan 2006 10:27:44 -0000
@@ -66,7 +66,7 @@ static void model_row_change_insert_cb (
 static void model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data);
 
 
-G_DEFINE_TYPE (EventEditor, event_editor, TYPE_COMP_EDITOR);
+G_DEFINE_TYPE (EventEditor, event_editor, TYPE_COMP_EDITOR)
 
 /* Class initialization function for the event editor */
 static void
Index: gui/dialogs/event-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/event-page.c,v
retrieving revision 1.98
diff -u -p -r1.98 event-page.c
--- gui/dialogs/event-page.c	6 Jan 2006 06:29:07 -0000	1.98
+++ gui/dialogs/event-page.c	9 Jan 2006 10:27:44 -0000
@@ -1051,6 +1051,7 @@ event_page_fill_widgets (CompEditorPage 
 
 			a = get_current_account (epage);
 			if (a != NULL) {
+				/* Reuse earlier declared *page, or rename this to avoid confusion? */
 				CompEditorPage *page = (CompEditorPage *) epage;
 				priv->ia = e_meeting_store_add_attendee_with_defaults (priv->model);
 				g_object_ref (priv->ia);
@@ -1115,7 +1116,7 @@ event_page_fill_widgets (CompEditorPage 
 	/* Alarms */
 	g_signal_handlers_block_matched (priv->alarm, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, epage);
 	if (e_cal_component_has_alarms (comp)) {
-		GList *alarms, *l;
+		GList *alarms, *list;
 		int alarm_type;
 		
 		e_dialog_toggle_set (priv->alarm, TRUE);
@@ -1124,10 +1125,10 @@ event_page_fill_widgets (CompEditorPage 
 		if (!is_custom_alarm_uid_list (comp, alarms, priv->old_summary, priv->alarm_units, priv->alarm_interval, &alarm_type))
 			e_dialog_option_menu_set (priv->alarm_time, alarm_type, alarm_map);
 
-		for (l = alarms; l != NULL; l = l->next) {
+		for (list = alarms; list != NULL; list = list->next) {
 			ECalComponentAlarm *ca;
 			
-			ca = e_cal_component_get_alarm (comp, l->data);
+			ca = e_cal_component_get_alarm (comp, list->data);
 			e_alarm_list_append (priv->alarm_list_store, NULL, ca);			
 			e_cal_component_alarm_free (ca);
 		}
@@ -1843,10 +1844,7 @@ static void
 popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	EventPage *epage = data;
-	EventPagePrivate *priv;
 	
-	priv = epage->priv;
-
 	remove_clicked_cb (NULL, epage);
 }
 
@@ -1952,9 +1950,7 @@ static gboolean
 list_key_press (EMeetingListView *list_view, GdkEventKey *event, EventPage *epage)
 {
 	if (event->keyval == GDK_Delete) {
-		EventPagePrivate *priv;
 	
-		priv = epage->priv;
 		remove_clicked_cb (NULL, epage);
 
 		return TRUE;
Index: gui/dialogs/meeting-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/meeting-page.c,v
retrieving revision 1.107
diff -u -p -r1.107 meeting-page.c
--- gui/dialogs/meeting-page.c	26 Nov 2005 02:31:51 -0000	1.107
+++ gui/dialogs/meeting-page.c	9 Jan 2006 10:27:44 -0000
@@ -105,7 +105,7 @@ static void meeting_page_focus_main_widg
 static gboolean meeting_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
 static gboolean meeting_page_fill_component (CompEditorPage *page, ECalComponent *comp);
 static void attendee_added_cb (EMeetingListView *emlv, EMeetingAttendee *attendee, gpointer user_data);
-G_DEFINE_TYPE (MeetingPage, meeting_page, TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (MeetingPage, meeting_page, TYPE_COMP_EDITOR_PAGE)
 
 /* Class initialization function for the task page */
 static void
@@ -733,18 +733,6 @@ remove_attendee (MeetingPage *mpage, EMe
 }
 
 static void
-remove_attendee_at_row (MeetingPage *mpage, int row) 
-{
-	MeetingPagePrivate *priv;
-	EMeetingAttendee *ia;
-	
-	priv = mpage->priv;
-
-	ia = e_meeting_store_find_attendee_at_row (priv->model, row);
-	remove_attendee (mpage, ia);
-}
-
-static void
 remove_clicked_cb (GtkButton *btn, MeetingPage *mpage)
 {
 	MeetingPagePrivate *priv;
@@ -796,7 +784,7 @@ remove_clicked_cb (GtkButton *btn, Meeti
 		gtk_tree_selection_select_iter (selection, &iter);
 	}
 	
-	g_list_foreach (paths, gtk_tree_path_free, NULL);
+	g_list_foreach (paths, (GFunc)gtk_tree_path_free, NULL);
 	g_list_free (paths);
 }
 
@@ -891,9 +879,6 @@ static void
 popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	MeetingPage *mpage = data;
-	MeetingPagePrivate *priv;
-	
-	priv = mpage->priv;
 
 	remove_clicked_cb (NULL, mpage);
 }
@@ -947,7 +932,7 @@ button_press_event (GtkWidget *widget, G
 			g_free (address);
 
 			if (ia) {
-				selection = gtk_tree_view_get_selection (priv->list_view);
+				selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
 				gtk_tree_selection_unselect_all (selection);
 				gtk_tree_selection_select_path (selection, path);
 		
@@ -1000,9 +985,6 @@ static gboolean
 list_key_press (EMeetingListView *list_view, GdkEventKey *event, MeetingPage *mpage)
 {
 	if (event->keyval == GDK_Delete) {
-		MeetingPagePrivate *priv;
-	
-		priv = mpage->priv;
 		remove_clicked_cb (NULL, mpage);
 
 		return TRUE;
@@ -1104,7 +1086,7 @@ meeting_page_construct (MeetingPage *mpa
 	priv->model = ems;
 
 	priv->list_view = e_meeting_list_view_new (priv->model); 
-	selection = gtk_tree_view_get_selection (priv->list_view);
+	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->list_view));
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
 	
 	g_signal_connect (G_OBJECT (priv->list_view), "button_press_event", G_CALLBACK (button_press_event), mpage);
@@ -1126,7 +1108,7 @@ meeting_page_construct (MeetingPage *mpa
 
 	g_signal_connect_after (G_OBJECT (mpage), "client_changed",
 				G_CALLBACK (client_changed_cb), NULL);
-	g_signal_connect (priv->list_view, "key_press_event", list_key_press, mpage);
+	g_signal_connect (priv->list_view, "key_press_event", G_CALLBACK (list_key_press), mpage);
 
 	return mpage;
 }
Index: gui/dialogs/memo-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/memo-editor.c,v
retrieving revision 1.2
diff -u -p -r1.2 memo-editor.c
--- gui/dialogs/memo-editor.c	14 Nov 2005 18:18:17 -0000	1.2
+++ gui/dialogs/memo-editor.c	9 Jan 2006 10:27:44 -0000
@@ -47,14 +47,7 @@ static void memo_editor_edit_comp (CompE
 static gboolean memo_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method);
 static void memo_editor_finalize (GObject *object);
 
-static void refresh_memo_cmd (GtkWidget *widget, gpointer data);
-static void cancel_memo_cmd (GtkWidget *widget, gpointer data);
-static void forward_cmd (GtkWidget *widget, gpointer data);
-
-static void model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
-static void model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data);
-
-G_DEFINE_TYPE (MemoEditor, memo_editor, TYPE_COMP_EDITOR);
+G_DEFINE_TYPE (MemoEditor, memo_editor, TYPE_COMP_EDITOR)
 
 
 
@@ -87,9 +80,6 @@ memo_editor_class_init (MemoEditorClass 
 static void
 init_widgets (MemoEditor *me)
 {
-	MemoEditorPrivate *priv;
-
-	priv = me->priv;
 }
 
 static void
@@ -145,10 +135,8 @@ static void
 memo_editor_set_e_cal (CompEditor *editor, ECal *client)
 {
 	MemoEditor *te;
-	MemoEditorPrivate *priv;
 
 	te = MEMO_EDITOR (editor);
-	priv = te->priv;
 
 	if (COMP_EDITOR_CLASS (memo_editor_parent_class)->set_e_cal)
 		COMP_EDITOR_CLASS (memo_editor_parent_class)->set_e_cal (editor, client);
@@ -159,8 +147,6 @@ memo_editor_edit_comp (CompEditor *edito
 {
 	MemoEditor *me;
 	MemoEditorPrivate *priv;
-	ECalComponentOrganizer organizer;
-	ECal *client;
 	
 	me = MEMO_EDITOR (editor);
 	priv = me->priv;
@@ -170,20 +156,12 @@ memo_editor_edit_comp (CompEditor *edito
 	if (COMP_EDITOR_CLASS (memo_editor_parent_class)->edit_comp)
 		COMP_EDITOR_CLASS (memo_editor_parent_class)->edit_comp (editor, comp);
 
-	client = comp_editor_get_e_cal (COMP_EDITOR (editor));
-
 	priv->updating = FALSE;
 }
 
 static gboolean
 memo_editor_send_comp (CompEditor *editor, ECalComponentItipMethod method)
 {
-	MemoEditor *me = MEMO_EDITOR (editor);
-	MemoEditorPrivate *priv;
-	ECalComponent *comp = NULL;
-
-	priv = me->priv;
-
 	if (COMP_EDITOR_CLASS (memo_editor_parent_class)->send_comp)
 		return COMP_EDITOR_CLASS (memo_editor_parent_class)->send_comp (editor, method);
 
@@ -232,54 +210,3 @@ memo_editor_new (ECal *client)
 	return memo_editor_construct (me, client);
 }
 
-static void
-refresh_memo_cmd (GtkWidget *widget, gpointer data)
-{
-	MemoEditor *me = MEMO_EDITOR (data);
-
-	comp_editor_send_comp (COMP_EDITOR (me), E_CAL_COMPONENT_METHOD_REFRESH);
-}
-
-static void
-cancel_memo_cmd (GtkWidget *widget, gpointer data)
-{
-	MemoEditor *me = MEMO_EDITOR (data);
-	ECalComponent *comp;
-	
-	comp = comp_editor_get_current_comp (COMP_EDITOR (me));
-	if (cancel_component_dialog ((GtkWindow *) me,
-				     comp_editor_get_e_cal (COMP_EDITOR (me)), comp, FALSE)) {
-		comp_editor_send_comp (COMP_EDITOR (me), E_CAL_COMPONENT_METHOD_CANCEL);
-		comp_editor_delete_comp (COMP_EDITOR (me));
-	}
-}
-
-static void
-forward_cmd (GtkWidget *widget, gpointer data)
-{
-	MemoEditor *me = MEMO_EDITOR (data);
-	
-	if (comp_editor_save_comp (COMP_EDITOR (me), TRUE))
-		comp_editor_send_comp (COMP_EDITOR (me), E_CAL_COMPONENT_METHOD_PUBLISH);
-}
-
-static void
-model_changed (MemoEditor *me)
-{
-	if (!me->priv->updating) {
-		comp_editor_set_changed (COMP_EDITOR (me), TRUE);
-		comp_editor_set_needs_send (COMP_EDITOR (me), TRUE);
-	}	
-}
-
-static void
-model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data)
-{
-	model_changed (MEMO_EDITOR (data));
-}
-
-static void
-model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data)
-{
-	model_changed (MEMO_EDITOR (data));
-}
Index: gui/dialogs/memo-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/memo-page.c,v
retrieving revision 1.2
diff -u -p -r1.2 memo-page.c
--- gui/dialogs/memo-page.c	26 Nov 2005 02:31:52 -0000	1.2
+++ gui/dialogs/memo-page.c	9 Jan 2006 10:27:44 -0000
@@ -85,7 +85,7 @@ static void memo_page_focus_main_widget 
 static gboolean memo_page_fill_widgets (CompEditorPage *page, ECalComponent *comp);
 static gboolean memo_page_fill_component (CompEditorPage *page, ECalComponent *comp);
 
-G_DEFINE_TYPE (MemoPage, memo_page, TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (MemoPage, memo_page, TYPE_COMP_EDITOR_PAGE)
 
 
 
Index: gui/dialogs/recurrence-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/recurrence-page.c,v
retrieving revision 1.71
diff -u -p -r1.71 recurrence-page.c
--- gui/dialogs/recurrence-page.c	26 Nov 2005 02:31:52 -0000	1.71
+++ gui/dialogs/recurrence-page.c	9 Jan 2006 10:27:44 -0000
@@ -210,7 +210,7 @@ static void recurrence_page_set_dates (C
 static void field_changed (RecurrencePage *apage);
 static void make_ending_count_special (RecurrencePage *rpage);
 
-G_DEFINE_TYPE (RecurrencePage, recurrence_page, TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (RecurrencePage, recurrence_page, TYPE_COMP_EDITOR_PAGE)
 
 /* Class initialization function for the recurrence page */
 static void
@@ -405,18 +405,13 @@ append_exception (RecurrencePage *rpage,
 static void
 fill_exception_widgets (RecurrencePage *rpage, ECalComponent *comp)
 {
-	RecurrencePagePrivate *priv;
 	GSList *list, *l;
-	gboolean added = FALSE;
 
-	priv = rpage->priv;
 	e_cal_component_get_exdate_list (comp, &list);
 
 	for (l = list; l; l = l->next) {
 		ECalComponentDateTime *cdt;
 
-		added = TRUE;
-
 		cdt = l->data;
 		append_exception (rpage, cdt);
 	}
@@ -2087,12 +2082,10 @@ static void
 exception_add_cb (GtkWidget *widget, gpointer data)
 {
 	RecurrencePage *rpage;
-	RecurrencePagePrivate *priv;
 	GtkWidget *dialog, *date_edit;
 	gboolean date_set;
 	
 	rpage = RECURRENCE_PAGE (data);
-	priv = rpage->priv;
 
 	dialog = create_exception_dialog (rpage, "Add exception", &date_edit);
 	
Index: gui/dialogs/schedule-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/schedule-page.c,v
retrieving revision 1.37
diff -u -p -r1.37 schedule-page.c
--- gui/dialogs/schedule-page.c	26 Nov 2005 02:31:52 -0000	1.37
+++ gui/dialogs/schedule-page.c	9 Jan 2006 10:27:44 -0000
@@ -79,7 +79,7 @@ static void schedule_page_set_dates (Com
 
 static void times_changed_cb (GtkWidget *widget, gpointer data);
 
-G_DEFINE_TYPE (SchedulePage, schedule_page, TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (SchedulePage, schedule_page, TYPE_COMP_EDITOR_PAGE)
 
 /* Class initialization function for the schedule page */
 static void
@@ -275,9 +275,6 @@ update_time (SchedulePage *spage, ECalCo
 static void
 clear_widgets (SchedulePage *spage)
 {
-	SchedulePagePrivate *priv;
-	
-	priv = spage->priv;
 }
 
 /* fill_widgets handler for the schedule page */
@@ -321,12 +318,6 @@ schedule_page_fill_widgets (CompEditorPa
 static gboolean
 schedule_page_fill_component (CompEditorPage *page, ECalComponent *comp)
 {
-	SchedulePage *spage;
-	SchedulePagePrivate *priv;
-	
-	spage = SCHEDULE_PAGE (page);
-	priv = spage->priv;
-
 	return TRUE;
 }
 
Index: gui/dialogs/task-details-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-details-page.c,v
retrieving revision 1.48
diff -u -p -r1.48 task-details-page.c
--- gui/dialogs/task-details-page.c	26 Nov 2005 02:31:52 -0000	1.48
+++ gui/dialogs/task-details-page.c	9 Jan 2006 10:27:44 -0000
@@ -96,7 +96,7 @@ static gboolean task_details_page_fill_w
 static gboolean task_details_page_fill_component (CompEditorPage *page, ECalComponent *comp);
 static gboolean task_details_page_fill_timezones (CompEditorPage *page, GHashTable *timezones);
 
-G_DEFINE_TYPE (TaskDetailsPage, task_details_page, TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (TaskDetailsPage, task_details_page, TYPE_COMP_EDITOR_PAGE)
 
 /* Class initialization function for the task page */
 static void
@@ -458,13 +458,8 @@ task_details_page_fill_component (CompEd
 static gboolean
 task_details_page_fill_timezones (CompEditorPage *page, GHashTable *timezones)
 {
-	TaskDetailsPage *tdpage;
-	TaskDetailsPagePrivate *priv;
 	icaltimezone *zone;
 
-	tdpage = TASK_DETAILS_PAGE (page);
-	priv = tdpage->priv;
-
 	/* add UTC timezone, which is the one used for the DATE-COMPLETED property */
 	zone = icaltimezone_get_utc_timezone ();
 	if (zone) {
@@ -537,12 +532,9 @@ get_widgets (TaskDetailsPage *tdpage)
 static void
 complete_date_changed (TaskDetailsPage *tdpage, time_t ctime, gboolean complete)
 {
-	TaskDetailsPagePrivate *priv;
 	CompEditorPageDates dates = {NULL, NULL, NULL, NULL};
 	icaltimezone *zone;
 	struct icaltimetype completed_tt = icaltime_null_time();
-
-	priv = tdpage->priv;
 
 	/* Get the current time in UTC. */
 	zone = icaltimezone_get_utc_timezone ();
Index: gui/dialogs/task-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-editor.c,v
retrieving revision 1.89
diff -u -p -r1.89 task-editor.c
--- gui/dialogs/task-editor.c	16 Nov 2005 14:14:23 -0000	1.89
+++ gui/dialogs/task-editor.c	9 Jan 2006 10:27:44 -0000
@@ -63,7 +63,7 @@ static void task_editor_finalize (GObjec
 static void model_row_change_insert_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer data);
 static void model_row_delete_cb (GtkTreeModel *model, GtkTreePath *path, gpointer data);
 
-G_DEFINE_TYPE (TaskEditor, task_editor, TYPE_COMP_EDITOR);
+G_DEFINE_TYPE (TaskEditor, task_editor, TYPE_COMP_EDITOR)
 
 /* Class initialization function for the event editor */
 static void
Index: gui/dialogs/task-page.c
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/dialogs/task-page.c,v
retrieving revision 1.78
diff -u -p -r1.78 task-page.c
--- gui/dialogs/task-page.c	21 Dec 2005 04:13:41 -0000	1.78
+++ gui/dialogs/task-page.c	9 Jan 2006 10:27:45 -0000
@@ -146,7 +146,7 @@ static gboolean task_page_fill_timezones
 static void task_page_set_summary (CompEditorPage *page, const char *summary);
 static void task_page_set_dates (CompEditorPage *page, CompEditorPageDates *dates);
 
-G_DEFINE_TYPE (TaskPage, task_page, TYPE_COMP_EDITOR_PAGE);
+G_DEFINE_TYPE (TaskPage, task_page, TYPE_COMP_EDITOR_PAGE)
 
 /* Class initialization function for the task page */
 static void
@@ -703,6 +703,7 @@ task_page_fill_widgets (CompEditorPage *
 
 			a = get_current_account (tpage);
 			if (a != NULL) {
+				/* Reuse *page declared further up? */
 				CompEditorPage *page = (CompEditorPage *) tpage;
 				priv->ia = e_meeting_store_add_attendee_with_defaults (priv->model);
 				g_object_ref (priv->ia);
@@ -1165,9 +1166,6 @@ static void
 popup_delete_cb (EPopup *ep, EPopupItem *pitem, void *data)
 {
 	TaskPage *page = data;
-	TaskPagePrivate *priv;
-	
-	priv = page->priv;
 
 	remove_clicked_cb (NULL, page);
 }
@@ -1274,9 +1272,7 @@ static gboolean
 list_key_press (EMeetingListView *list_view, GdkEventKey *event, TaskPage *page)
 {
 	if (event->keyval == GDK_Delete) {
-		TaskPagePrivate *priv;
 	
-		priv = page->priv;
 		remove_clicked_cb (NULL, page);
 
 		return TRUE;
