Make action group management in shell windows more elegant.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/calendar/modules/e-memo-shell-view-private.c b/calendar/modules/e-memo-shell-view-private.c
index 10b20c1827..a945415b03 100644
--- a/calendar/modules/e-memo-shell-view-private.c
+++ b/calendar/modules/e-memo-shell-view-private.c
@@ -160,8 +160,6 @@ e_memo_shell_view_private_init (EMemoShellView *memo_shell_view,
 	g_return_if_fail (E_IS_SOURCE_LIST (source_list));
 
 	priv->source_list = g_object_ref (source_list);
-	priv->memo_actions = gtk_action_group_new ("memos");
-	priv->filter_actions = gtk_action_group_new ("memos-filter");
 
 	if (!gal_view_collection_loaded (shell_view_class->view_collection))
 		memo_shell_view_load_view_collection (shell_view_class);
@@ -180,6 +178,7 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	EShellView *shell_view;
 	EShellContent *shell_content;
 	EShellSidebar *shell_sidebar;
+	EShellWindow *shell_window;
 	EMemoTable *memo_table;
 	ECalModel *model;
 	ETable *table;
@@ -188,6 +187,10 @@ e_memo_shell_view_private_constructed (EMemoShellView *memo_shell_view)
 	shell_view = E_SHELL_VIEW (memo_shell_view);
 	shell_content = e_shell_view_get_shell_content (shell_view);
 	shell_sidebar = e_shell_view_get_shell_sidebar (shell_view);
+	shell_window = e_shell_view_get_shell_window (shell_view);
+
+	e_shell_window_add_action_group (shell_window, "memos");
+	e_shell_window_add_action_group (shell_window, "memos-filter");
 
 	/* Cache these to avoid lots of awkward casting. */
 	priv->memo_shell_content = g_object_ref (shell_content);
@@ -284,9 +287,6 @@ e_memo_shell_view_private_dispose (EMemoShellView *memo_shell_view)
 
 	DISPOSE (priv->source_list);
 
-	DISPOSE (priv->memo_actions);
-	DISPOSE (priv->filter_actions);
-
 	DISPOSE (priv->memo_shell_content);
 	DISPOSE (priv->memo_shell_sidebar);