Rewrite the mail label code from top to bottom.

  - Kill the e-util-labels API and read label information into a
    single-column GtkListStore.  Use GConfBridge to automatically
    keep GConf synched with the list store.

  - The list store (a singleton instance) is stored in EShellSettings
    so it's available everywhere.

  - The list store serves as the model for EMailLabelTreeView,
    which itself is embedded in EMailLabelManager; a complete
    label management UI as seen in the preferences dialog.

  - EMailLabelDialog is used to add or edit a label.  Avoid using a
    color button, instead embed a GtkColorSelection directly in the
    dialog so everything is in one window.

Open issues:

  - The weird toggle/color/text menu items in the popup menu aren't
    there.  For now they're just regular toggle items.  I'll deal
    with it later.

  - Filter intergration is broken at the moment.


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

1 files changed, 31 insertions, 0 deletions

diff --git a/mail/e-mail-shell-view-private.c b/mail/e-mail-shell-view-private.c
index 4ad0d68e59..fba8df06f5 100644
--- a/mail/e-mail-shell-view-private.c
+++ b/mail/e-mail-shell-view-private.c
@@ -154,23 +154,39 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
 {
 	EMailShellViewPrivate *priv = mail_shell_view->priv;
 	EMailShellSidebar *mail_shell_sidebar;
+	EShell *shell;
 	EShellView *shell_view;
 	EShellContent *shell_content;
+	EShellSettings *shell_settings;
 	EShellSidebar *shell_sidebar;
 	EShellWindow *shell_window;
 	EMFolderTreeModel *folder_tree_model;
 	EMFolderTree *folder_tree;
+	GtkTreeModel *tree_model;
+	GtkUIManager *ui_manager;
 	MessageList *message_list;
 	EMailReader *reader;
+	guint merge_id;
 	gchar *uri;
 
 	shell_view = E_SHELL_VIEW (mail_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);
+	ui_manager = e_shell_window_get_ui_manager (shell_window);
+
+	shell = e_shell_window_get_shell (shell_window);
+	shell_settings = e_shell_get_shell_settings (shell);
+
+	tree_model = e_shell_settings_get_object (
+		shell_settings, "mail-label-list-store");
 
 	e_shell_window_add_action_group (shell_window, "mail");
 	e_shell_window_add_action_group (shell_window, "mail-filter");
+	e_shell_window_add_action_group (shell_window, "mail-label");
+
+	merge_id = gtk_ui_manager_new_merge_id (ui_manager);
+	priv->label_merge_id = merge_id;
 
 	/* Cache these to avoid lots of awkward casting. */
 	priv->mail_shell_content = g_object_ref (shell_content);
@@ -208,6 +224,21 @@ e_mail_shell_view_private_constructed (EMailShellView *mail_shell_view)
 		G_CALLBACK (mail_shell_view_reader_changed_cb),
 		mail_shell_view);
 
+	g_signal_connect_swapped (
+		tree_model, "row-changed",
+		G_CALLBACK (e_mail_shell_view_update_search_filter),
+		mail_shell_view);
+
+	g_signal_connect_swapped (
+		tree_model, "row-deleted",
+		G_CALLBACK (e_mail_shell_view_update_search_filter),
+		mail_shell_view);
+
+	g_signal_connect_swapped (
+		tree_model, "row-inserted",
+		G_CALLBACK (e_mail_shell_view_update_search_filter),
+		mail_shell_view);
+
 	e_mail_shell_view_actions_init (mail_shell_view);
 	e_mail_shell_view_update_search_filter (mail_shell_view);
 	e_mail_reader_init (reader);