From a86194e0ab9160f0a2f571048cc80e841db261e7 Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Sat, 30 Sep 2000 00:35:31 +0000 Subject: [PATCH] Fix bug 3074: local html files not displayed by mozilla. add a 2000-09-29 Mathieu Lacage Fix bug 3074: local html files not displayed by mozilla. * components/mozilla/nautilus-mozilla-content-view.c: (mozilla_vfs_read_callback), (mozilla_vfs_callback), (nautilus_mozilla_content_view_load_uri): add a report_load_underway call where necessary. --- ChangeLog | 8 ++++++++ components/mozilla/nautilus-mozilla-content-view.c | 7 ++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 556b0183c..95db48ade 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2000-09-29 Mathieu Lacage + + Fix bug 3074: local html files not displayed by mozilla. + * components/mozilla/nautilus-mozilla-content-view.c: + (mozilla_vfs_read_callback), (mozilla_vfs_callback), + (nautilus_mozilla_content_view_load_uri): add a + report_load_underway call where necessary. + 2000-09-29 J Shane Culpepper * components/help/converters/gnome-info2html2/html.c: diff --git a/components/mozilla/nautilus-mozilla-content-view.c b/components/mozilla/nautilus-mozilla-content-view.c index 8ce4777ba..a3826c2e9 100644 --- a/components/mozilla/nautilus-mozilla-content-view.c +++ b/components/mozilla/nautilus-mozilla-content-view.c @@ -368,7 +368,7 @@ mozilla_vfs_read_callback (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, g #ifdef DEBUG_ramiro g_print ("mozilla_vfs_read_callback: %ld/%ld bytes\n", (long) bytes_read, (long) bytes_requested); #endif - + nautilus_view_report_load_underway (view->details->nautilus_view); if (bytes_read != 0) { gtk_moz_embed_append_data (GTK_MOZ_EMBED (view->details->mozilla), buffer, bytes_read); } @@ -408,7 +408,6 @@ mozilla_vfs_callback (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, gpoint gnome_vfs_async_read (handle, vfs_read_buf, sizeof (vfs_read_buf), mozilla_vfs_read_callback, view); } } - /** * nautilus_mozilla_content_view_load_uri: * @@ -421,7 +420,7 @@ nautilus_mozilla_content_view_load_uri (NautilusMozillaContentView *view, const char *uri) { GnomeVFSAsyncHandle *async_handle; - + g_assert (uri != NULL); view->details->got_called_by_nautilus = TRUE; @@ -441,8 +440,10 @@ nautilus_mozilla_content_view_load_uri (NautilusMozillaContentView *view, if (strncmp (uri, "http:", 5) == 0) { gtk_moz_embed_load_url (GTK_MOZ_EMBED (view->details->mozilla), view->details->uri); } else { + nautilus_view_report_load_underway (view->details->nautilus_view); gnome_vfs_async_open (&async_handle, uri, GNOME_VFS_OPEN_READ, mozilla_vfs_callback, view); } + } static void