Merge new-ui-branch to the trunk.

svn path=/trunk/; revision=22965

1 files changed, 13 insertions, 0 deletions

diff --git a/calendar/gui/e-cal-view.h b/calendar/gui/e-cal-view.h
index ea7c11a00d..9a09a5236a 100644
--- a/calendar/gui/e-cal-view.h
+++ b/calendar/gui/e-cal-view.h
@@ -96,6 +96,8 @@ ECalModel     *e_cal_view_get_model (ECalView *cal_view);
 void           e_cal_view_set_model (ECalView *cal_view, ECalModel *model);
 icaltimezone  *e_cal_view_get_timezone (ECalView *cal_view);
 void           e_cal_view_set_timezone (ECalView *cal_view, icaltimezone *zone);
+const char    *e_cal_view_get_default_category (ECalView *cal_view);
+void           e_cal_view_set_default_category (ECalView *cal_view, const char *category);
 
 void           e_cal_view_set_status_message (ECalView *cal_view, const gchar *message);
 
@@ -114,6 +116,17 @@ void           e_cal_view_delete_selected_occurrence (ECalView *cal_view);
 
 GtkMenu       *e_cal_view_create_popup_menu (ECalView *cal_view);
 
+void           e_cal_view_new_appointment_for (ECalView *cal_view,
+					       time_t dtstart,
+					       time_t dtend,
+					       gboolean all_day,
+					       gboolean meeting);
+void           e_cal_view_new_appointment (ECalView *cal_view);
+void           e_cal_view_edit_appointment (ECalView *cal_view,
+					    CalClient *client,
+					    icalcomponent *icalcomp,
+					    gboolean meeting);
+
 G_END_DECLS
 
 #endif