[balsa] Update menus only if necessary

[Peter Bloomfield <PeterB src gnome org>]

commit 9ecb03083c123f9bca3eadab8dcebb529ad1d745
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Sat Jan 23 09:44:55 2010 -0500

    Update menus only if necessary
    
    	* src/main-window.c: update menus only if they will not be
    	updated when a message is shown.

 ChangeLog         |    5 +++++
 src/main-window.c |   14 +++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 8309232..196180b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-23  Peter Bloomfield
+
+	* src/main-window.c: update menus only if they will not be
+	updated when a message is shown.
+
 2010-01-23  Pawel Salek
 
 	* src/main-window.c: update copyright date.
diff --git a/src/main-window.c b/src/main-window.c
index 0c58968..f044552 100644
--- a/src/main-window.c
+++ b/src/main-window.c
@@ -4901,10 +4901,10 @@ bw_notebook_switch_page_cb(GtkWidget * notebook,
     index = BALSA_INDEX(gtk_bin_get_child(GTK_BIN(page)));
 
     window->current_index = GTK_WIDGET(index);
-    g_object_add_weak_pointer(G_OBJECT(window->current_index),
+    g_object_add_weak_pointer(G_OBJECT(index),
 			      (gpointer) &window->current_index);
     /* Note when this mailbox was exposed, for use in auto-expunge. */
-    time(&BALSA_INDEX(window->current_index)->mailbox_node->last_use);
+    time(&index->mailbox_node->last_use);
 
     mailbox = index->mailbox_node->mailbox;
     if (mailbox->name) {
@@ -4946,10 +4946,14 @@ bw_notebook_switch_page_cb(GtkWidget * notebook,
     balsa_index_refresh_size(index);
     balsa_index_ensure_visible(index);
 
+    if (!index->current_msgno) {
+        /* If we're setting a message, the menus will be updated;
+         * otherwise, we'll reset them now. */
+        bw_enable_edit_menus(window, NULL);
 #if !defined(ENABLE_TOUCH_UI)
-    bw_enable_edit_menus(window, NULL);
-    bw_enable_part_menu_items(window);
-#endif /*ENABLE_TOUCH_UI */
+        bw_enable_part_menu_items(window);
+#endif                          /*ENABLE_TOUCH_UI */
+    }
 
     g_free(balsa_app.current_mailbox_url);
     balsa_app.current_mailbox_url = g_strdup(mailbox->url);