evolution r37131 - in branches/kill-bonobo: shell widgets/misc

[mbarnes svn gnome org]

Author: mbarnes
Date: Sun Jan 25 03:58:06 2009
New Revision: 37131
URL: http://svn.gnome.org/viewvc/evolution?rev=37131&view=rev

Log:
Fix a crash when cancelling a task in the task bar.
Tinker with task bar padding.


Modified:
   branches/kill-bonobo/shell/e-shell-taskbar.c
   branches/kill-bonobo/shell/e-shell-window-private.c
   branches/kill-bonobo/widgets/misc/e-activity-proxy.c

Modified: branches/kill-bonobo/shell/e-shell-taskbar.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-taskbar.c	(original)
+++ branches/kill-bonobo/shell/e-shell-taskbar.c	Sun Jan 25 03:58:06 2009
@@ -283,7 +283,7 @@
 	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 @@
 	 *     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

Modified: branches/kill-bonobo/shell/e-shell-window-private.c
==============================================================================
--- branches/kill-bonobo/shell/e-shell-window-private.c	(original)
+++ branches/kill-bonobo/shell/e-shell-window-private.c	Sun Jan 25 03:58:06 2009
@@ -263,15 +263,15 @@
 	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;
 

Modified: branches/kill-bonobo/widgets/misc/e-activity-proxy.c
==============================================================================
--- branches/kill-bonobo/widgets/misc/e-activity-proxy.c	(original)
+++ branches/kill-bonobo/widgets/misc/e-activity-proxy.c	Sun Jan 25 03:58:06 2009
@@ -151,6 +151,9 @@
 	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;
 	}