# HG changeset patch
# User zas_
# Date 1209976338 0
# Node ID de3e2bc2233695c76ba13f53378f1b2f51f3c301
# Parent  8f696e43873d99202a00492ee40075e068c374cb
Revert patch 675, and correctly fix gtk assertion failure.

diff -r 8f696e43873d -r de3e2bc22336 src/layout.c
--- a/src/layout.c	Mon May 05 08:15:52 2008 +0000
+++ b/src/layout.c	Mon May 05 08:32:18 2008 +0000
@@ -567,7 +567,7 @@
 		image_osd_update(lw->image);
 		}
 
-	gtk_label_set_text(GTK_LABEL(lw->info_status), text);
+	if (lw->info_status) gtk_label_set_text(GTK_LABEL(lw->info_status), text);
 	g_free(buf);
 }
 
diff -r 8f696e43873d -r de3e2bc22336 src/view_file_icon.c
--- a/src/view_file_icon.c	Mon May 05 08:15:52 2008 +0000
+++ b/src/view_file_icon.c	Mon May 05 08:32:18 2008 +0000
@@ -627,7 +627,7 @@
 				}
 
 			label = g_object_get_data(G_OBJECT(VFICON_INFO(vf, tip_window)), "tip_label");
-			if (label) gtk_label_set_text(GTK_LABEL(label), VFICON_INFO(vf, tip_id)->fd->name);
+			gtk_label_set_text(GTK_LABEL(label), VFICON_INFO(vf, tip_id)->fd->name);
 			}
 		}
 	else