Do not call control_util_set_folder_bar_label().

* gui/tasks-control.c (tasks_control_activate): Do not call
control_util_set_folder_bar_label().

* gui/e-calendar-table.c (e_calendar_table_set_status_message):
Use e_activity_handler_operation_progressing(), not
evolution_activity_client_update().

* gui/e-cal-view.c: Remove settings menu.
(on_settings): Remove.

* gui/calendar-commands.c (get_shell_view_interface): Remove.
(control_util_set_folder_bar_label): Remove.
(calendar_set_folder_bar_label): Remove.
(control_util_show_settings): Remove.
(gcal_calendar_dates_change_cb): Remove.
(calendar_control_activate): Do not connect, do not call
calendar_set_folder_bar_label().

svn path=/trunk/; revision=23614

1 files changed, 0 insertions, 13 deletions

diff --git a/calendar/gui/e-calendar-view.c b/calendar/gui/e-calendar-view.c
index 4d2db99905..f93cee6c10 100644
--- a/calendar/gui/e-calendar-view.c
+++ b/calendar/gui/e-calendar-view.c
@@ -1091,15 +1091,6 @@ on_publish (GtkWidget *widget, gpointer user_data)
 }
 
 static void
-on_settings (GtkWidget *widget, gpointer user_data)
-{
-	ECalendarView *cal_view;
-
-	cal_view = E_CALENDAR_VIEW (user_data);
-	control_util_show_settings (cal_view->priv->calendar);
-}
-
-static void
 on_delete_appointment (GtkWidget *widget, gpointer user_data)
 {
 	ECalendarView *cal_view;
@@ -1207,10 +1198,6 @@ static EPopupMenu main_items [] = {
 
 	E_POPUP_ITEM (N_("_Publish Free/Busy Information"), GTK_SIGNAL_FUNC (on_publish), 0),
 
-	E_POPUP_SEPARATOR,
-
-	E_POPUP_ITEM (N_("_Settings..."), GTK_SIGNAL_FUNC (on_settings), 0),
-
 	E_POPUP_TERMINATOR
 };