Fix a crash when cancelling a task in the task bar.

Tinker with task bar padding.

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

3 files changed, 8 insertions, 5 deletions

diff --git a/shell/e-shell-taskbar.c b/shell/e-shell-taskbar.c
index 0f2b0af5d2..9d1ef40ef7 100644
--- a/shell/e-shell-taskbar.c
+++ b/shell/e-shell-taskbar.c
@@ -283,7 +283,7 @@ shell_taskbar_init (EShellTaskbar *shell_taskbar)
 	shell_taskbar->priv->label = g_object_ref (widget);
 	gtk_widget_hide (widget);
 
-	widget = gtk_hbox_new (FALSE, 1);
+	widget = gtk_hbox_new (FALSE, 3);
 	gtk_box_pack_start (GTK_BOX (shell_taskbar), widget, TRUE, TRUE, 0);
 	shell_taskbar->priv->hbox = g_object_ref (widget);
 	gtk_widget_hide (widget);
@@ -293,7 +293,7 @@ shell_taskbar_init (EShellTaskbar *shell_taskbar)
 	 *     The true value is probably buried in a style property. */
 	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, NULL, &height);
 	gtk_widget_set_size_request (
-		GTK_WIDGET (shell_taskbar), -1, height * 2);
+		GTK_WIDGET (shell_taskbar), -1, (height * 2) + 6);
 }
 
 GType
diff --git a/shell/e-shell-window-private.c b/shell/e-shell-window-private.c
index f16a8a68f5..a33f7b7852 100644
--- a/shell/e-shell-window-private.c
+++ b/shell/e-shell-window-private.c
@@ -263,15 +263,15 @@ e_shell_window_private_init (EShellWindow *shell_window)
 	priv->content_pane = g_object_ref (widget);
 	gtk_widget_show (widget);
 
-	widget = gtk_hbox_new (FALSE, 2);
-	gtk_container_set_border_width (GTK_CONTAINER (widget), 1);
+	widget = gtk_hbox_new (FALSE, 3);
+	gtk_container_set_border_width (GTK_CONTAINER (widget), 3);
 	gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
 	priv->status_area = g_object_ref (widget);
 	gtk_widget_show (widget);
 
 	/* Make the status area as large as the task bar. */
 	gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, NULL, &height);
-	gtk_widget_set_size_request (widget, -1, height * 2);
+	gtk_widget_set_size_request (widget, -1, (height * 2) + 6);
 
 	container = priv->content_pane;
 
diff --git a/widgets/misc/e-activity-proxy.c b/widgets/misc/e-activity-proxy.c
index 24ffa5e521..dc41e71f8f 100644
--- a/widgets/misc/e-activity-proxy.c
+++ b/widgets/misc/e-activity-proxy.c
@@ -151,6 +151,9 @@ activity_proxy_dispose (GObject *object)
 	priv = E_ACTIVITY_PROXY_GET_PRIVATE (object);
 
 	if (priv->activity != NULL) {
+		g_signal_handlers_disconnect_matched (
+			priv->activity, G_SIGNAL_MATCH_FUNC, 0, 0,
+			NULL, activity_proxy_update, NULL);
 		g_object_unref (priv->activity);
 		priv->activity = NULL;
 	}