[gnumeric] Enable sheet tab menu when objects are selected. [#604496]

[Andreas J. Guelzow <guelzow src gnome org>]

commit cec1940964faf77b2fa0ad5c1273328a84b98c7f
Author: Andreas J. Guelzow <aguelzow pyrshep ca>
Date:   Sun Dec 27 23:45:27 2009 -0700

    Enable sheet tab menu when objects are selected. [#604496]
    
    2009-12-28  Andreas J. Guelzow <aguelzow pyrshep ca>
    
    	* src/wbc-gtk.c (cb_sheet_label_button_press): unselect sheet
    	  objects if necessary and possible

 ChangeLog     |    5 +++++
 NEWS          |    1 +
 src/wbc-gtk.c |   13 ++++++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 37d430b..ab61925 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-28  Andreas J. Guelzow <aguelzow pyrshep ca>
+
+	* src/wbc-gtk.c (cb_sheet_label_button_press): unselect sheet 
+	  objects if necessary and possible
+
 2009-12-27  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* src/sheet-object.c (sheet_object_populate_menu_real): change "Si_ze"
diff --git a/NEWS b/NEWS
index 1f6b6c6..4c5b32b 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ Andreas:
 	* Allow sheet object size and position to be specified via a dialog.
 	* Allow the sheet object name to be specified. [#596545]
 	* Add menu item to select sheet objects. [#338615]
+	* Enable sheet tab menu when objects are selected. [#604496]
 
 Jean
 	* Fix import export of line type in scatter plots. [#605043]
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 1c74865..5364fd2 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -578,11 +578,14 @@ cb_sheet_label_button_press (GtkWidget *widget, GdkEventButton *event,
 	if (event->button == 1 || NULL != wbcg->rangesel)
 		return TRUE;
 
-	if (event->button == 3 &&
-	    editable_label_get_editable (EDITABLE_LABEL (widget))) {
-		sheet_menu_label_run (scg, event);
-		scg_take_focus (scg);
-		return TRUE;
+	if (event->button == 3) {
+		if ((scg_wbcg (scg))->edit_line.guru == NULL)
+			scg_object_unselect (scg, NULL);
+		if (editable_label_get_editable (EDITABLE_LABEL (widget))) {
+			sheet_menu_label_run (scg, event);
+			scg_take_focus (scg);
+			return TRUE;
+		}
 	}
 
 	return FALSE;