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, 17 insertions, 0 deletions

diff --git a/mail/e-mail-shell-module-settings.c b/mail/e-mail-shell-module-settings.c
index d04bb23b91..06474755ef 100644
--- a/mail/e-mail-shell-module-settings.c
+++ b/mail/e-mail-shell-module-settings.c
@@ -25,17 +25,34 @@
 #include <libedataserver/e-account-list.h>
 
 #include "e-util/e-signature-list.h"
+#include "mail/e-mail-label-list-store.h"
 
 void
 e_mail_shell_module_init_settings (EShell *shell)
 {
 	EShellSettings *shell_settings;
+	gpointer object;
 
 	shell_settings = e_shell_get_shell_settings (shell);
 
 	/* XXX Default values should match the GConf schema.
 	 *     Yes it's redundant, but we're stuck with GConf. */
 
+	/*** Global Objects ***/
+
+	e_shell_settings_install_property (
+		g_param_spec_object (
+			"mail-label-list-store",
+			NULL,
+			NULL,
+			E_TYPE_MAIL_LABEL_LIST_STORE,
+			G_PARAM_READWRITE));
+
+	object = e_mail_label_list_store_new ();
+	e_shell_settings_set_object (
+		shell_settings, "mail-label-list-store", object);
+	g_object_unref (object);
+
 	/*** Mail Preferences ***/
 
 	e_shell_settings_install_property (