diff options
| author | Peter Moulder <peter.moulder@monash.edu> | 2007-06-21 09:05:40 +0000 |
|---|---|---|
| committer | pjrm <pjrm@users.sourceforge.net> | 2007-06-21 09:05:40 +0000 |
| commit | 0f4eb09b61ba2b30a349fa11014176df2c0ace5f (patch) | |
| tree | a841e587d4815190dd08ec07916defedad86977a /src/extension | |
| parent | Committed patch 170667 (diff) | |
| download | inkscape-0f4eb09b61ba2b30a349fa11014176df2c0ace5f.tar.gz inkscape-0f4eb09b61ba2b30a349fa11014176df2c0ace5f.zip | |
Handle the case of gnome_vfs_init failing. (Fixes Debian bug http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415640.)
(bzr r3082)
Diffstat (limited to 'src/extension')
| -rw-r--r-- | src/extension/input.cpp | 11 | ||||
| -rw-r--r-- | src/extension/internal/svg.cpp | 4 |
2 files changed, 3 insertions, 12 deletions
diff --git a/src/extension/input.cpp b/src/extension/input.cpp index 94b0f6ab4..e17c690aa 100644 --- a/src/extension/input.cpp +++ b/src/extension/input.cpp @@ -153,16 +153,7 @@ Input::open (const gchar *uri) } timer->touch(); - SPDocument * doc = NULL; - -#ifdef WITH_GNOME_VFS - doc = imp->open(this, uri); -#else - if (Inkscape::IO::file_test(uri, G_FILE_TEST_EXISTS)) { - doc = imp->open(this, uri); - } -#endif - + SPDocument *const doc = imp->open(this, uri); if (doc != NULL) { Inkscape::XML::Node * repr = sp_document_repr_root(doc); bool saved = sp_document_get_undo_sensitive(doc); diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp index 5d7b38c33..33cbfe150 100644 --- a/src/extension/internal/svg.cpp +++ b/src/extension/internal/svg.cpp @@ -102,7 +102,7 @@ Svg::init(void) #ifdef WITH_GNOME_VFS #define BUF_SIZE 8192 -gchar * +static gchar * _load_uri (const gchar *uri) { GnomeVFSHandle *handle = NULL; @@ -148,7 +148,7 @@ SPDocument * Svg::open (Inkscape::Extension::Input *mod, const gchar *uri) { #ifdef WITH_GNOME_VFS - if (gnome_vfs_uri_is_local(gnome_vfs_uri_new(uri))) { + if (!gnome_vfs_initialized() || gnome_vfs_uri_is_local(gnome_vfs_uri_new(uri))) { // Use built-in loader instead of VFS for this return sp_document_new(uri, TRUE); } |