Merge revisions 37075:37107 from trunk.

svn path=/branches/kill-bonobo/; revision=37112

9 files changed, 41 insertions, 14 deletions

diff --git a/calendar/modules/e-cal-shell-content.c b/calendar/modules/e-cal-shell-content.c
index cc1f1ca879..f0d2024f9b 100644
--- a/calendar/modules/e-cal-shell-content.c
+++ b/calendar/modules/e-cal-shell-content.c
@@ -473,7 +473,7 @@ cal_shell_content_constructed (GObject *object)
 	container = priv->vpaned;
 
 	widget = gtk_vbox_new (FALSE, 0);
-	gtk_paned_pack1 (GTK_PANED (container), widget, TRUE, TRUE);
+	gtk_paned_pack1 (GTK_PANED (container), widget, FALSE, FALSE);
 	gtk_widget_show (widget);
 
 	container = widget;
@@ -501,7 +501,7 @@ cal_shell_content_constructed (GObject *object)
 	container = priv->vpaned;
 
 	widget = gtk_vbox_new (FALSE, 0);
-	gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, TRUE);
+	gtk_paned_pack2 (GTK_PANED (container), widget, TRUE, FALSE);
 	gtk_widget_show (widget);
 
 	container = widget;
diff --git a/calendar/modules/e-cal-shell-sidebar.c b/calendar/modules/e-cal-shell-sidebar.c
index 312cb8649c..ee887cecba 100644
--- a/calendar/modules/e-cal-shell-sidebar.c
+++ b/calendar/modules/e-cal-shell-sidebar.c
@@ -172,6 +172,10 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar,
 	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED ||
+		status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
+		auth_cal_forget_password (client);
+
 	switch (status) {
 		case E_CALENDAR_STATUS_OK:
 			g_signal_handlers_disconnect_matched (
@@ -186,6 +190,10 @@ cal_shell_sidebar_client_opened_cb (ECalShellSidebar *cal_shell_sidebar,
 				cal_shell_sidebar, NULL);
 			break;
 
+		case E_CALENDAR_STATUS_AUTHENTICATION_FAILED:
+			e_cal_open_async (client, FALSE);
+			break;
+
 		case E_CALENDAR_STATUS_BUSY:
 			break;
 
diff --git a/calendar/modules/e-cal-shell-view-actions.c b/calendar/modules/e-cal-shell-view-actions.c
index 8b0f0df65b..bc2f38e5bd 100644
--- a/calendar/modules/e-cal-shell-view-actions.c
+++ b/calendar/modules/e-cal-shell-view-actions.c
@@ -1038,6 +1038,9 @@ e_cal_shell_view_actions_init (ECalShellView *cal_shell_view)
 	gtk_action_group_add_actions (
 		action_group, calendar_entries,
 		G_N_ELEMENTS (calendar_entries), cal_shell_view);
+	e_action_group_add_popup_actions (
+		action_group, calendar_popup_entries,
+		G_N_ELEMENTS (calendar_popup_entries));
 	gtk_action_group_add_radio_actions (
 		action_group, calendar_view_entries,
 		G_N_ELEMENTS (calendar_view_entries), GNOME_CAL_DAY_VIEW,
diff --git a/calendar/modules/e-cal-shell-view-memopad.c b/calendar/modules/e-cal-shell-view-memopad.c
index b78bdd1c50..c30d3cfa5c 100644
--- a/calendar/modules/e-cal-shell-view-memopad.c
+++ b/calendar/modules/e-cal-shell-view-memopad.c
@@ -88,7 +88,6 @@ action_calendar_memopad_forward_cb (GtkAction *action,
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
 	icalcomponent *clone;
-	ECalComponentItipMethod method;
 	GSList *list;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
@@ -102,9 +101,10 @@ action_calendar_memopad_forward_cb (GtkAction *action,
 	/* XXX We only forward the first selected memo. */
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	method = E_CAL_COMPONENT_METHOD_PUBLISH;
 	e_cal_component_set_icalcomponent (comp, clone);
-	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	itip_send_comp (
+		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
+		comp_data->client, NULL, NULL, NULL, TRUE);
 	g_object_unref (comp);
 }
 
diff --git a/calendar/modules/e-cal-shell-view-taskpad.c b/calendar/modules/e-cal-shell-view-taskpad.c
index 651cf1e878..c04ce2c6d1 100644
--- a/calendar/modules/e-cal-shell-view-taskpad.c
+++ b/calendar/modules/e-cal-shell-view-taskpad.c
@@ -111,7 +111,6 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
 	icalcomponent *clone;
-	ECalComponentItipMethod method;
 	GSList *list;
 
 	cal_shell_content = cal_shell_view->priv->cal_shell_content;
@@ -125,9 +124,10 @@ action_calendar_taskpad_forward_cb (GtkAction *action,
 	/* XXX We only forward the first selected task. */
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	method = E_CAL_COMPONENT_METHOD_PUBLISH;
 	e_cal_component_set_icalcomponent (comp, clone);
-	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	itip_send_comp (
+		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
+		comp_data->client, NULL, NULL, NULL, TRUE);
 	g_object_unref (comp);
 }
 
diff --git a/calendar/modules/e-memo-shell-sidebar.c b/calendar/modules/e-memo-shell-sidebar.c
index d676a9bf58..4dcff2ff35 100644
--- a/calendar/modules/e-memo-shell-sidebar.c
+++ b/calendar/modules/e-memo-shell-sidebar.c
@@ -194,6 +194,10 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar,
 	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED ||
+		status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
+		auth_cal_forget_password (client);
+
 	switch (status) {
 		case E_CALENDAR_STATUS_OK:
 			g_signal_handlers_disconnect_matched (
@@ -208,6 +212,10 @@ memo_shell_sidebar_client_opened_cb (EMemoShellSidebar *memo_shell_sidebar,
 				memo_shell_sidebar, NULL);
 			break;
 
+		case E_CALENDAR_STATUS_AUTHENTICATION_FAILED:
+			e_cal_open_async (client, FALSE);
+			break;
+
 		case E_CALENDAR_STATUS_BUSY:
 			break;
 
diff --git a/calendar/modules/e-memo-shell-view-actions.c b/calendar/modules/e-memo-shell-view-actions.c
index 98f8569425..4f487b7e7d 100644
--- a/calendar/modules/e-memo-shell-view-actions.c
+++ b/calendar/modules/e-memo-shell-view-actions.c
@@ -109,7 +109,6 @@ action_memo_forward_cb (GtkAction *action,
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
 	icalcomponent *clone;
-	ECalComponentItipMethod method;
 	GSList *list;
 
 	memo_shell_content = memo_shell_view->priv->memo_shell_content;
@@ -123,9 +122,10 @@ action_memo_forward_cb (GtkAction *action,
 	/* XXX We only forward the first selected memo. */
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	method = E_CAL_COMPONENT_METHOD_PUBLISH;
 	e_cal_component_set_icalcomponent (comp, clone);
-	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	itip_send_comp (
+		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
+		comp_data->client, NULL, NULL, NULL, TRUE);
 	g_object_unref (comp);
 }
 
diff --git a/calendar/modules/e-task-shell-sidebar.c b/calendar/modules/e-task-shell-sidebar.c
index 6f2f1bb409..9631321edb 100644
--- a/calendar/modules/e-task-shell-sidebar.c
+++ b/calendar/modules/e-task-shell-sidebar.c
@@ -167,6 +167,10 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar,
 	shell_view = e_shell_sidebar_get_shell_view (shell_sidebar);
 	shell_window = e_shell_view_get_shell_window (shell_view);
 
+	if (status == E_CALENDAR_STATUS_AUTHENTICATION_FAILED ||
+		status == E_CALENDAR_STATUS_AUTHENTICATION_REQUIRED)
+		auth_cal_forget_password (client);
+
 	switch (status) {
 		case E_CALENDAR_STATUS_OK:
 			g_signal_handlers_disconnect_matched (
@@ -181,6 +185,10 @@ task_shell_sidebar_client_opened_cb (ETaskShellSidebar *task_shell_sidebar,
 				task_shell_sidebar, NULL);
 			break;
 
+		case E_CALENDAR_STATUS_AUTHENTICATION_FAILED:
+			e_cal_open_async (client, FALSE);
+			break;
+
 		case E_CALENDAR_STATUS_BUSY:
 			break;
 
diff --git a/calendar/modules/e-task-shell-view-actions.c b/calendar/modules/e-task-shell-view-actions.c
index 8e1695afa2..c59c55bd17 100644
--- a/calendar/modules/e-task-shell-view-actions.c
+++ b/calendar/modules/e-task-shell-view-actions.c
@@ -156,7 +156,6 @@ action_task_forward_cb (GtkAction *action,
 	ECalModelComponent *comp_data;
 	ECalComponent *comp;
 	icalcomponent *clone;
-	ECalComponentItipMethod method;
 	GSList *list;
 
 	task_shell_content = task_shell_view->priv->task_shell_content;
@@ -170,9 +169,10 @@ action_task_forward_cb (GtkAction *action,
 	/* XXX We only forward the first selected task. */
 	comp = e_cal_component_new ();
 	clone = icalcomponent_new_clone (comp_data->icalcomp);
-	method = E_CAL_COMPONENT_METHOD_PUBLISH;
 	e_cal_component_set_icalcomponent (comp, clone);
-	itip_send_comp (method, comp, comp_data->client, NULL, NULL, NULL);
+	itip_send_comp (
+		E_CAL_COMPONENT_METHOD_PUBLISH, comp,
+		comp_data->client, NULL, NULL, NULL, TRUE);
 	g_object_unref (comp);
 }