diff options
| author | Gene Z. Ragan <gzr@eazel.com> | 2000-08-30 17:38:36 +0000 |
|---|---|---|
| committer | Gene Ragan <gzr@src.gnome.org> | 2000-08-30 17:38:36 +0000 |
| commit | 6f400c4f36ae3dabc2c2faeb08c2afe816829b74 (patch) | |
| tree | 8db0b6a236c454dadaa16527244f6419be8fafdb /libnautilus-extensions/nautilus-mime-actions.c | |
| parent | 049e67101bc07e0328d89d02e9f84183ddc4291c (diff) | |
| download | nautilus-6f400c4f36ae3dabc2c2faeb08c2afe816829b74.tar.gz | |
Fixed bug 1158, GnomeVFSMimeHandlers code needs error handling.
2000-08-30 Gene Z. Ragan <gzr@eazel.com>
* libnautilus-extensions/nautilus-mime-actions.c:
(nautilus_mime_get_default_component_for_uri_internal):
Fixed bug 1158, GnomeVFSMimeHandlers code needs error handling.
There was a lonely FIXME here. A NULL is now returned instead of
an assert. A NULL is handled properly by all callers of this function.
* src/file-manager/fm-desktop-icon-view.c: (event_callback),
(fm_desktop_icon_view_initialize):
Work in progress trying to get keyboard events to the desktop.
I am working with John Harper on this.
Diffstat (limited to 'libnautilus-extensions/nautilus-mime-actions.c')
| -rw-r--r-- | libnautilus-extensions/nautilus-mime-actions.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libnautilus-extensions/nautilus-mime-actions.c b/libnautilus-extensions/nautilus-mime-actions.c index 0eec7d2b9..28f6d5d58 100644 --- a/libnautilus-extensions/nautilus-mime-actions.c +++ b/libnautilus-extensions/nautilus-mime-actions.c @@ -349,13 +349,8 @@ nautilus_mime_get_default_component_for_uri_internal (const char *uri, gboolean } } else { g_assert (info_list == NULL); /* or else we are leaking it */ - server = NULL; - - /* FIXME bugzilla.eazel.com 1158: replace this - assertion with proper reporting of the error, once - the API supports error handling. */ - - g_assert_not_reached (); + server = NULL; + return NULL; } nautilus_file_list_free (files); |