Support inline renaming of sources in the source selector, with help

from evolution-data-server (see bug #558322).
Kill another frivolous plugin: select-one-source

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

1 files changed, 20 insertions, 0 deletions

diff --git a/calendar/modules/e-cal-shell-view-private.c b/calendar/modules/e-cal-shell-view-private.c
index 8b1f0d9c82..561ff4a2b0 100644
--- a/calendar/modules/e-cal-shell-view-private.c
+++ b/calendar/modules/e-cal-shell-view-private.c
@@ -116,6 +116,19 @@ cal_shell_view_mini_calendar_scroll_event_cb (ECalShellView *cal_shell_view,
 		cal_shell_view, calitem);
 }
 
+static gboolean
+cal_shell_view_selector_popup_event_cb (EShellView *shell_view,
+                                        ESource *primary_source,
+                                        GdkEventButton *event)
+{
+	const gchar *widget_path;
+
+	widget_path = "/calendar-popup";
+	e_shell_view_show_popup_menu (shell_view, widget_path, event);
+
+	return TRUE;
+}
+
 static void
 cal_shell_view_memopad_popup_event_cb (EShellView *shell_view,
                                        GdkEventButton *event)
@@ -240,6 +253,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 	ECalendar *mini_calendar;
 	EMemoTable *memo_table;
 	ECalendarTable *task_table;
+	ESourceSelector *selector;
 	guint id;
 
 	shell_view = E_SHELL_VIEW (cal_shell_view);
@@ -256,6 +270,7 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 	task_table = e_cal_shell_content_get_task_table (cal_shell_content);
 
 	cal_shell_sidebar = E_CAL_SHELL_SIDEBAR (shell_sidebar);
+	selector = e_cal_shell_sidebar_get_selector (cal_shell_sidebar);
 	mini_calendar = e_cal_shell_sidebar_get_mini_calendar (cal_shell_sidebar);
 
 	e_calendar_item_set_get_time_callback (
@@ -285,6 +300,11 @@ e_cal_shell_view_private_constructed (ECalShellView *cal_shell_view)
 		cal_shell_view);
 
 	g_signal_connect_swapped (
+		selector, "popup-event",
+		G_CALLBACK (cal_shell_view_selector_popup_event_cb),
+		cal_shell_view);
+
+	g_signal_connect_swapped (
 		memo_table, "popup-event",
 		G_CALLBACK (cal_shell_view_memopad_popup_event_cb),
 		cal_shell_view);