[evolution/webkit-composer: 162/181] EEditor: Pack an EActivityBar widget.

[Matthew Barnes <mbarnes src gnome org>]

commit dca00aa738cfba3a892f46ca113d4f24b97ca16f
Author: Matthew Barnes <mbarnes redhat com>
Date:   Thu Feb 7 16:17:34 2013 -0500

    EEditor: Pack an EActivityBar widget.

 e-util/e-editor-private.h |    1 +
 e-util/e-editor.c         |   14 ++++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)
---
diff --git a/e-util/e-editor-private.h b/e-util/e-editor-private.h
index 5acf2fb..0ac4334 100644
--- a/e-util/e-editor-private.h
+++ b/e-util/e-editor-private.h
@@ -61,6 +61,7 @@ struct _EEditorPrivate {
 	GtkWidget *main_toolbar;
 	GtkWidget *edit_toolbar;
 	GtkWidget *html_toolbar;
+	GtkWidget *activity_bar;
 	GtkWidget *alert_bar;
 	GtkWidget *edit_area;
 
diff --git a/e-util/e-editor.c b/e-util/e-editor.c
index e763911..b0f0594 100644
--- a/e-util/e-editor.c
+++ b/e-util/e-editor.c
@@ -24,6 +24,7 @@
 
 #include "e-editor.h"
 
+#include "e-activity-bar.h"
 #include "e-alert-bar.h"
 #include "e-alert-dialog.h"
 #include "e-alert-sink.h"
@@ -609,11 +610,19 @@ editor_constructed (GObject *object)
 	priv->html_toolbar = g_object_ref (widget);
 	gtk_widget_show (widget);
 
+	/* Construct the activity bar. */
+
+	widget = e_activity_bar_new ();
+	gtk_widget_set_hexpand (widget, TRUE);
+	gtk_grid_attach (GTK_GRID (editor), widget, 0, 2, 1, 1);
+	priv->activity_bar = g_object_ref (widget);
+	/* EActivityBar controls its own visibility. */
+
 	/* Construct the alert bar for errors. */
 
 	widget = e_alert_bar_new ();
 	gtk_widget_set_hexpand (widget, TRUE);
-	gtk_grid_attach (GTK_GRID (editor), widget, 0, 2, 1, 1);
+	gtk_grid_attach (GTK_GRID (editor), widget, 0, 3, 1, 1);
 	priv->alert_bar = g_object_ref (widget);
 	/* EAlertBar controls its own visibility. */
 
@@ -627,7 +636,7 @@ editor_constructed (GObject *object)
 		GTK_SCROLLED_WINDOW (widget), GTK_SHADOW_IN);
 	gtk_widget_set_hexpand (widget, TRUE);
 	gtk_widget_set_vexpand (widget, TRUE);
-	gtk_grid_attach (GTK_GRID (editor), widget, 0, 3, 1, 1);
+	gtk_grid_attach (GTK_GRID (editor), widget, 0, 4, 1, 1);
 	priv->scrolled_window = g_object_ref (widget);
 	gtk_widget_show (widget);
 
@@ -727,6 +736,7 @@ editor_dispose (GObject *object)
 	g_clear_object (&priv->main_toolbar);
 	g_clear_object (&priv->edit_toolbar);
 	g_clear_object (&priv->html_toolbar);
+	g_clear_object (&priv->activity_bar);
 	g_clear_object (&priv->alert_bar);
 	g_clear_object (&priv->edit_area);