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

7 files changed, 21 insertions, 138 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 4f1eff5b74..d401f2a96a 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,23 @@
+2003-12-03  Ettore Perazzoli  <ettore@ximian.com>
+
+	* 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().
+
 2003-12-03  JP Rosevear <jpr@ximian.com>
 
 	* gui/gnome-cal.c (gnome_calendar_destroy): free the notification
diff --git a/calendar/gui/calendar-commands.c b/calendar/gui/calendar-commands.c
index 5f9038fd72..3ed09c3bc7 100644
--- a/calendar/gui/calendar-commands.c
+++ b/calendar/gui/calendar-commands.c
@@ -399,35 +399,6 @@ purge_cmd (BonoboUIComponent *uic, gpointer data, const gchar *path)
 	gtk_widget_destroy (dialog);
 }
 
-/* Does a queryInterface on the control's parent control frame for the ShellView interface */
-static GNOME_Evolution_ShellView
-get_shell_view_interface (BonoboControl *control)
-{
-	Bonobo_ControlFrame control_frame;
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	control_frame = bonobo_control_get_control_frame (control, NULL);
-
-	g_assert (control_frame != CORBA_OBJECT_NIL);
-
-	CORBA_exception_init (&ev);
-	shell_view = Bonobo_Unknown_queryInterface (control_frame,
-						    "IDL:GNOME/Evolution/ShellView:" BASE_VERSION,
-						    &ev);
-	if (BONOBO_EX (&ev)) {
-		g_message ("get_shell_view_interface(): "
-			   "Could not queryInterface() on the control frame");
-		shell_view = CORBA_OBJECT_NIL;
-		goto out;
-	}
-
-	CORBA_exception_free (&ev);
-
- out:
-
-	return shell_view;
-}
 
 const gchar *
 calendar_get_text_for_folder_bar_label (GnomeCalendar *gcal)
@@ -531,62 +502,6 @@ calendar_get_text_for_folder_bar_label (GnomeCalendar *gcal)
 	return buffer;
 }
 
-/* Displays the currently displayed time range in the folder bar label on the
-   shell view, according to which view we are showing. */
-void
-calendar_set_folder_bar_label (GnomeCalendar *gcal, BonoboControl *control)
-{
-	char *buffer = (char *)calendar_get_text_for_folder_bar_label (gcal);
-	control_util_set_folder_bar_label (control, buffer);
-}
-
-void
-control_util_set_folder_bar_label (BonoboControl *control, char *label)
-{
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	shell_view = get_shell_view_interface (control);
-	if (shell_view == CORBA_OBJECT_NIL)
-		return;
-
-	CORBA_exception_init (&ev);
-	GNOME_Evolution_ShellView_setFolderBarLabel (shell_view, label, &ev);
-
-	if (BONOBO_EX (&ev))
-		g_message ("control_util_set_folder_bar_label(): Could not set the folder bar label");
-
-	CORBA_exception_free (&ev);
-
-	bonobo_object_release_unref (shell_view, NULL);
-}
-
-void
-control_util_show_settings (GnomeCalendar *gcal)
-{
-	BonoboControl *control;
-	GNOME_Evolution_ShellView shell_view;
-	CORBA_Environment ev;
-
-	control = g_object_get_data (G_OBJECT (gcal), "control");
-	if (control == NULL)
-		return;
-
-	shell_view = get_shell_view_interface (control);
-	if (shell_view == CORBA_OBJECT_NIL)
-		return;
-
-	CORBA_exception_init (&ev);
-	
-	GNOME_Evolution_ShellView_showSettings (shell_view, &ev);
-	
-	if (BONOBO_EX (&ev))
-		g_message ("control_util_show_settings(): Could not show settings");
-
-	CORBA_exception_free (&ev);
-
-	bonobo_object_release_unref (shell_view, NULL);
-}
 
 /* Sensitizes the UI Component menu/toolbar calendar commands based on the
  * number of selected events. (This will always be 0 or 1 currently.)  If enable
@@ -694,18 +609,6 @@ sensitize_taskpad_commands (GnomeCalendar *gcal, BonoboControl *control, gboolea
 				      NULL);
 }
 
-/* Callback used when the dates shown by the GnomeCalendar are changed.
-   We want to update the dates in the folder bar. */
-static void
-gcal_calendar_dates_change_cb (GnomeCalendar *gcal, gpointer data)
-{
-	BonoboControl *control;
-
-	control = BONOBO_CONTROL (data);
-
-	calendar_set_folder_bar_label (gcal, control);
-}
-
 /* Callback used when the selection in the calendar views changes */
 static void
 gcal_calendar_selection_changed_cb (GnomeCalendar *gcal, gpointer data)
@@ -857,9 +760,6 @@ calendar_control_activate (BonoboControl *control,
 
 	gnome_calendar_setup_view_menus (gcal, uic);
 
-	g_signal_connect (gcal, "dates_shown_changed",
-			  G_CALLBACK (gcal_calendar_dates_change_cb),
-			  control);
 	g_signal_connect (gcal, "calendar_focus_change",
 			  G_CALLBACK (gcal_calendar_focus_change_cb), control);
 	g_signal_connect (gcal, "taskpad_focus_change",
@@ -877,8 +777,6 @@ calendar_control_activate (BonoboControl *control,
 	calendar_config_check_timezone_set ();
 #endif
 
-	calendar_set_folder_bar_label (gcal, control);
-
 	focus = g_new (FocusData, 1);
 	focus->calendar_focused = FALSE;
 	focus->taskpad_focused = FALSE;
diff --git a/calendar/gui/calendar-commands.h b/calendar/gui/calendar-commands.h
index 44ceb41c4e..901d01d845 100644
--- a/calendar/gui/calendar-commands.h
+++ b/calendar/gui/calendar-commands.h
@@ -37,13 +37,6 @@ void calendar_control_sensitize_calendar_commands (BonoboControl *control, Gnome
 
 void calendar_goto_today (GnomeCalendar *gcal);
 
-void calendar_set_folder_bar_label (GnomeCalendar *gcal, BonoboControl *control);
-
 const gchar * calendar_get_text_for_folder_bar_label (GnomeCalendar *gcal);
-/* Used by calendar and tasks control to set the folder title bar label. */
-void control_util_set_folder_bar_label (BonoboControl *control, char *label);
-
-/* Used by calendar views and tasks to show the settings dialog */
-void control_util_show_settings (GnomeCalendar *gcal);
 
 #endif /* CALENDAR_COMMANDS_H */
diff --git a/calendar/gui/e-cal-view.c b/calendar/gui/e-cal-view.c
index 4d2db99905..f93cee6c10 100644
--- a/calendar/gui/e-cal-view.c
+++ b/calendar/gui/e-cal-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
 };
 
diff --git a/calendar/gui/e-calendar-table.c b/calendar/gui/e-calendar-table.c
index 74be935d5c..d9ea59905b 100644
--- a/calendar/gui/e-calendar-table.c
+++ b/calendar/gui/e-calendar-table.c
@@ -1459,6 +1459,6 @@ e_calendar_table_set_status_message (ECalendarTable *cal_table, const gchar *mes
 
                 g_free (client_id);
         } else {
-                evolution_activity_client_update (activity_handler, cal_table->activity_id, message, -1.0);
+                e_activity_handler_operation_progressing (activity_handler, cal_table->activity_id, message, -1.0);
 	}
 }
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
 };
 
diff --git a/calendar/gui/tasks-control.c b/calendar/gui/tasks-control.c
index 7b92889809..0c0a3bd202 100644
--- a/calendar/gui/tasks-control.c
+++ b/calendar/gui/tasks-control.c
@@ -335,8 +335,6 @@ tasks_control_activate (BonoboControl *control, ETasks *tasks)
 #if 0
 	calendar_config_check_timezone_set ();
 #endif
-
-	control_util_set_folder_bar_label (control, "");
 }