[evolution/gnome-3-2] Bug #659828 - Selecting a message with a sound attached loses focus

[Milan Crha <mcrha src gnome org>]

commit 5c1ba20566860a9170c79e44ef4bd378ba2f8146
Author: Milan Crha <mcrha redhat com>
Date:   Mon Sep 26 12:27:28 2011 +0200

    Bug #659828 - Selecting a message with a sound attached loses focus

 mail/em-format-html-display.c |    2 +-
 widgets/table/e-tree.c        |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c
index dcaafed..de16507 100644
--- a/mail/em-format-html-display.c
+++ b/mail/em-format-html-display.c
@@ -1208,7 +1208,7 @@ efhd_attachment_button (EMFormatHTML *efh,
 	/* If the button is created, then give it focus after
 	 * it is realized, so that user can use arrow keys to scroll
 	 * message */
-	if (efhd->priv->attachment_expanded || e_attachment_button_get_expanded (E_ATTACHMENT_BUTTON (widget))) {
+	if (efhd->priv->attachment_expanded) {
 		g_signal_connect (
 			widget, "realize",
 			G_CALLBACK (attachment_button_realized), NULL);
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 67d9020..4181865 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -1156,7 +1156,7 @@ et_canvas_root_event (GnomeCanvasItem *root,
 /* Handler for focus events in the table_canvas; we have to repaint ourselves
  * and give the focus to some ETableItem.
  */
-static gint
+static gboolean
 table_canvas_focus_event_cb (GtkWidget *widget,
                              GdkEventFocus *event,
                              gpointer data)