Mercurial > geeqie.yaz

changeset 583:de3e2bc22336

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert patch 675, and correctly fix gtk assertion failure.
author zas_
date Mon, 05 May 2008 08:32:18 +0000
parents 8f696e43873d
children 4609c84c9ce0
files src/layout.c src/view_file_icon.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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);
 }
 
--- 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