diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2011-08-21 07:42:08 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2011-08-21 07:42:08 +0000 |
| commit | cf0c689f665675b976215e80ec7c9acf1b2e49e6 (patch) | |
| tree | e354db785e6a49f4fde879d82c23f05d0c61b339 /src/file.cpp | |
| parent | Filters. More filters clean-up. (diff) | |
| download | inkscape-cf0c689f665675b976215e80ec7c9acf1b2e49e6.tar.gz inkscape-cf0c689f665675b976215e80ec7c9acf1b2e49e6.zip | |
DBUS. Merging lp:~joakim-verona/inkscape/dbus-fixes changes.
(bzr r10559)
Diffstat (limited to 'src/file.cpp')
| -rw-r--r-- | src/file.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/file.cpp b/src/file.cpp index 43d1ddaaa..c6d43fa51 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -952,7 +952,7 @@ sp_file_save_a_copy(Gtk::Window &parentWindow, gpointer /*object*/, gpointer /*d /** * Import a resource. Called by sp_file_import() */ -void +SPObject * file_import(SPDocument *in_doc, const Glib::ustring &uri, Inkscape::Extension::Extension *key) { @@ -1067,14 +1067,14 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri, doc->doUnref(); DocumentUndo::done(in_doc, SP_VERB_FILE_IMPORT, _("Import")); - + return new_obj; } else { gchar *text = g_strdup_printf(_("Failed to load the requested file %s"), uri.c_str()); sp_ui_error_dialog(text); g_free(text); } - return; + return NULL; } |