Revert patch 675, and correctly fix gtk assertion failure.

diff --git a/src/layout.c b/src/layout.c
index 02c8733..6a37cb2 100644 (file)
--- a/src/layout.c
+++ b/src/layout.c
@@ -567,7 +567,7 @@ void layout_status_update_info(LayoutWindow *lw, const gchar *text)
                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 --git a/src/view_file_icon.c b/src/view_file_icon.c
index 6c5283e..4c08a10 100644 (file)
--- a/src/view_file_icon.c
+++ b/src/view_file_icon.c
@@ -627,7 +627,7 @@ static void tip_update(ViewFile *vf, IconData *id)
                                }
 
                        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