[nautilus] icon-canvas-item: don't draw pango layouts when renaming

[Cosimo Cecchi <cosimoc src gnome org>]

commit f07aa75bf010653bd9e1a5f5519fec8a029763de
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Thu Sep 22 10:11:45 2011 -0400

    icon-canvas-item: don't draw pango layouts when renaming
    
    Fixes a regression introduced in commit
    95910c94fd46f368b66f02e1961dc5f273b38c82 that causes unwanted text to be
    drawn while renaming a file in icon view.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=659831

 libnautilus-private/nautilus-icon-canvas-item.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/libnautilus-private/nautilus-icon-canvas-item.c b/libnautilus-private/nautilus-icon-canvas-item.c
index ee60a39..a68164a 100644
--- a/libnautilus-private/nautilus-icon-canvas-item.c
+++ b/libnautilus-private/nautilus-icon-canvas-item.c
@@ -1116,7 +1116,8 @@ draw_label_text (NautilusIconCanvasItem *item,
 		x = text_rect.x0 + ((text_rect.x1 - text_rect.x0) - max_text_width) / 2;
 	}
 	
-	if (have_editable) {
+	if (have_editable &&
+	    !details->is_renaming) {
 		state = GTK_STATE_FLAG_NORMAL;
 
 		if (prelight_label && item->details->is_prelit) {
@@ -1142,7 +1143,8 @@ draw_label_text (NautilusIconCanvasItem *item,
 		gtk_style_context_restore (context);
 	}
 
-	if (have_additional) {
+	if (have_additional &&
+	    !details->is_renaming) {
 		state = GTK_STATE_FLAG_NORMAL;
 
 		if (needs_highlight && gtk_widget_has_focus (GTK_WIDGET (container))) {