gnome/nautilus
gnome/nautilus
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/nautilus synced 2024-11-05 16:04:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bug 3074: local html files not displayed by mozilla. add a

Browse source 
2000-09-29  Mathieu Lacage  <mathieu@eazel.com>

	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.
This commit is contained in:
Mathieu Lacage 2000-09-30 00:35:31 +00:00 committed by Mathieu Lacage
parent 88145317f5
commit a86194e0ab
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2000-09-29 Mathieu Lacage <mathieu@eazel.com>
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 <pepper@eazel.com> 2000-09-29 J Shane Culpepper <pepper@eazel.com>
* components/help/converters/gnome-info2html2/html.c: * components/help/converters/gnome-info2html2/html.c:

7
components/mozilla/nautilus-mozilla-content-view.c
View file

@ -368,7 +368,7 @@ mozilla_vfs_read_callback (GnomeVFSAsyncHandle *handle, GnomeVFSResult result, g
#ifdef DEBUG_ramiro #ifdef DEBUG_ramiro
g_print ("mozilla_vfs_read_callback: %ld/%ld bytes\n", (long) bytes_read, (long) bytes_requested); g_print ("mozilla_vfs_read_callback: %ld/%ld bytes\n", (long) bytes_read, (long) bytes_requested);
#endif #endif
nautilus_view_report_load_underway (view->details->nautilus_view);
if (bytes_read != 0) { if (bytes_read != 0) {
gtk_moz_embed_append_data (GTK_MOZ_EMBED (view->details->mozilla), buffer, bytes_read); 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); gnome_vfs_async_read (handle, vfs_read_buf, sizeof (vfs_read_buf), mozilla_vfs_read_callback, view);
} }
} }
/** /**
* nautilus_mozilla_content_view_load_uri: * nautilus_mozilla_content_view_load_uri:
* *
@ -421,7 +420,7 @@ nautilus_mozilla_content_view_load_uri (NautilusMozillaContentView *view,
const char *uri) const char *uri)
{ {
GnomeVFSAsyncHandle *async_handle; GnomeVFSAsyncHandle *async_handle;
g_assert (uri != NULL); g_assert (uri != NULL);
view->details->got_called_by_nautilus = TRUE; 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) { if (strncmp (uri, "http:", 5) == 0) {
gtk_moz_embed_load_url (GTK_MOZ_EMBED (view->details->mozilla), view->details->uri); gtk_moz_embed_load_url (GTK_MOZ_EMBED (view->details->mozilla), view->details->uri);
} else { } 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); gnome_vfs_async_open (&async_handle, uri, GNOME_VFS_OPEN_READ, mozilla_vfs_callback, view);
} }
} }
static void static void