Commit cdbead7e authored by John Sullivan's avatar John Sullivan

Changed a recently-introduced assertion to a warning, and temporarily

allowed warnings to be non-fatal even when NAUTILUS_DEBUG is defined.
This allows us to continue working on Nautilus until the vfs problem
about directory iterating is fixed.
parent b46c91c1
1999-12-16 John Sullivan <sullivan.com>
* src/file-manager/fm-directory-view.c (directory_load_cb):
changed assert to warning
* src/ntl-main.c (main): removed G_LOG_LEVEL_WARNING from
the set of fatal levels when NAUTILUS_DEBUG is defined,
so we can continue to work on other parts of nautilus
until the only-one-icon-in-a-window vfs problem is fixed.
1999-12-16 Elliot Lee <sopwith@redhat.com>
* components/help/hyperbola-nav-tree.c: Translate strings.
......
......@@ -735,7 +735,11 @@ directory_load_cb (GnomeVFSAsyncHandle *handle,
view = FM_DIRECTORY_VIEW (callback_data);
g_assert(!view->directory_list || view->directory_list == list);
// FIXME: This should be an assert, changed to a warning for now
// so we can continue developing other features until this is resolved.
if (!view->directory_list || view->directory_list == list) {
g_warning("unexpected view->directory_list!");
}
if (view->directory_list == NULL) {
if (result == GNOME_VFS_OK || result == GNOME_VFS_ERROR_EOF) {
......
......@@ -74,9 +74,12 @@ int main(int argc, char *argv[])
};
GtkWidget *mainwin;
GnomeGenericFactory *gfact;
// FIXME: This should also include G_LOG_LEVEL_WARNING, but I had to take it
// out temporarily so we could continue to work on other parts of the software
// until the only-one-icon-shows-up problem is fixed
if (getenv("NAUTILUS_DEBUG"))
g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
orb = gnome_CORBA_init_with_popt_table("nautilus", VERSION, &argc, argv, options, 0, &ctx, GNORBA_INIT_SERVER_FUNC, &ev);
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
......
......@@ -74,9 +74,12 @@ int main(int argc, char *argv[])
};
GtkWidget *mainwin;
GnomeGenericFactory *gfact;
// FIXME: This should also include G_LOG_LEVEL_WARNING, but I had to take it
// out temporarily so we could continue to work on other parts of the software
// until the only-one-icon-shows-up problem is fixed
if (getenv("NAUTILUS_DEBUG"))
g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_WARNING);
g_log_set_always_fatal(G_LOG_FATAL_MASK | G_LOG_LEVEL_CRITICAL);
orb = gnome_CORBA_init_with_popt_table("nautilus", VERSION, &argc, argv, options, 0, &ctx, GNORBA_INIT_SERVER_FUNC, &ev);
bonobo_init(orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment