[evolution/wip/webkit-composer: 665/966] EMsgComposer: Defer alert handling to EEditorWindow.

[Tomas Popela <tpopela src gnome org>]

commit 3457678a230cafe0180ae5bc0a49e2f9c39d0a46
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Feb 7 16:04:15 2013 -0500

    EMsgComposer: Defer alert handling to EEditorWindow.
    
    It's nice having all the base classes in Evolution finally.

 composer/e-composer-private.c |   11 +++++------
 composer/e-composer-private.h |    1 +
 composer/e-msg-composer.c     |    2 --
 3 files changed, 6 insertions(+), 8 deletions(-)
---
diff --git a/composer/e-composer-private.c b/composer/e-composer-private.c
index 5163c0d..acdfd8f 100644
--- a/composer/e-composer-private.c
+++ b/composer/e-composer-private.c
@@ -184,12 +184,6 @@ e_composer_private_constructed (EMsgComposer *composer)
        priv->activity_bar = g_object_ref (widget);
        /* EActivityBar controls its own visibility. */
 
-       /* Construct the alert bar for errors. */
-
-       widget = e_alert_bar_new ();
-       gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
-       gtk_widget_show (widget);
-
        /* Construct the header table. */
 
        widget = e_composer_header_table_new (client_cache);
@@ -324,6 +318,11 @@ e_composer_private_dispose (EMsgComposer *composer)
                composer->priv->header_table = NULL;
        }
 
+       if (composer->priv->activity_bar != NULL) {
+               g_object_unref (composer->priv->activity_bar);
+               composer->priv->activity_bar = NULL;
+       }
+
        if (composer->priv->attachment_paned != NULL) {
                g_object_unref (composer->priv->attachment_paned);
                composer->priv->attachment_paned = NULL;
diff --git a/composer/e-composer-private.h b/composer/e-composer-private.h
index c9d554f..b87167b 100644
--- a/composer/e-composer-private.h
+++ b/composer/e-composer-private.h
@@ -62,6 +62,7 @@ struct _EMsgComposerPrivate {
        /*** UI Management ***/
 
        GtkWidget *header_table;
+       GtkWidget *activity_bar;
        GtkWidget *attachment_paned;
 
        EFocusTracker *focus_tracker;
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 4e97722..17223ba 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -154,8 +154,6 @@ G_DEFINE_TYPE_WITH_CODE (
        EMsgComposer,
        e_msg_composer,
        E_TYPE_EDITOR_WINDOW,
-       G_IMPLEMENT_INTERFACE (
-               E_TYPE_ALERT_SINK, e_msg_composer_alert_sink_init)
        G_IMPLEMENT_INTERFACE (E_TYPE_EXTENSIBLE, NULL))
 
 static void