Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22965

1 files changed, 0 insertions, 7 deletions

diff --git a/calendar/gui/e-day-view.h b/calendar/gui/e-day-view.h
index 1c39fd5844..decd281127 100644
--- a/calendar/gui/e-day-view.h
+++ b/calendar/gui/e-day-view.h
@@ -453,9 +453,6 @@ struct _EDayView
 	gint am_string_width;
 	gint pm_string_width;
 
-	/* The default category for new events */
-	char *default_category;
-
 	/* The activity client used to show messages on the status bar. */
 	EvolutionActivityClient *activity;
 };
@@ -472,9 +469,6 @@ GtkWidget* e_day_view_new			(void);
 void       e_day_view_set_query			(EDayView	*day_view,
 						 const char	*sexp);
 
-void       e_day_view_set_default_category	(EDayView	*day_view,
-						 const char	*category);
-
 /* Whether we are displaying a work-week, in which case the display always
    starts on the first day of the working week. */
 gboolean   e_day_view_get_work_week_view	(EDayView	*day_view);
@@ -528,7 +522,6 @@ void	   e_day_view_set_week_start_day	(EDayView	*day_view,
 						 gint		 week_start_day);
 
 void       e_day_view_delete_occurrence         (EDayView       *day_view);
-void       e_day_view_unrecur_appointment       (EDayView *day_view);
 
 /* Returns the number of selected events (0 or 1 at present). */
 gint	   e_day_view_get_num_events_selected	(EDayView	*day_view);