Fix compile when NEW_EXPORT_DIALOG is defined (however, the dialog crashes when tryin...

diff --git a/src/file.cpp b/src/file.cpp
index 420eaec6393c7038ba576ad9f7a99f4beb4bc4d2..fd1438eb6cf1446ed0073ba6aaf141b56857b8e3 100644 (file)
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -1130,7 +1130,7 @@ sp_file_import(Gtk::Window &parentWindow)
  *  Display an Export dialog, export as the selected type if OK pressed
  */
 bool
-sp_file_export_dialog(void *widget)
+sp_file_export_dialog(Gtk::Window &parentWindow)
 {
     //# temp hack for 'doc' until we can switch to this dialog
     SPDocument *doc = SP_ACTIVE_DOCUMENT;
@@ -1192,6 +1192,7 @@ sp_file_export_dialog(void *widget)
     //# Show the Export dialog
     Inkscape::UI::Dialog::FileExportDialog *exportDialogInstance =
         Inkscape::UI::Dialog::FileExportDialog::create(
+            parentWindow,
             export_path,
             Inkscape::UI::Dialog::EXPORT_TYPES,
             (char const *) _("Select file to export to"),
@@ -1220,7 +1221,7 @@ sp_file_export_dialog(void *widget)
         else
             g_warning( "Error converting save filename to UTF-8." );
 
-        success = file_save(doc, fileName, selectionType, TRUE, FALSE);
+        success = file_save(parentWindow, doc, fileName, selectionType, TRUE, FALSE, Inkscape::Extension::FILE_SAVE_METHOD_EXPORT);
 
         if (success) {
             Glib::RefPtr<Gtk::RecentManager> recent = Gtk::RecentManager::get_default();
@@ -1243,7 +1244,7 @@ sp_file_export_dialog(void *widget)
  *
  */
 bool
-sp_file_export_dialog(void */*widget*/)
+sp_file_export_dialog(Gtk::Window &/*parentWindow*/)
 {
     sp_export_dialog();
     return true;

diff --git a/src/file.h b/src/file.h
index 9913fbe1aa4a00d1b564846b00361f6732b8ea04..770e519abb541bc0d63b7d73f96d9b6adb432821 100644 (file)
--- a/src/file.h
+++ b/src/file.h
@@ -141,7 +141,7 @@ void file_import(SPDocument *in_doc, const Glib::ustring &uri,
  * additional type selection, to allow the user to export
  * the a document as a given type.
  */
-bool sp_file_export_dialog (void *widget);
+bool sp_file_export_dialog (Gtk::Window &parentWindow);
 
 
 /*######################

diff --git a/src/verbs.cpp b/src/verbs.cpp
index 43ddc1459ad016eb98ddac80dceb8d7b33575d2c..b634e2a447492be02b9960a5bd334c2f41ba4f95 100644 (file)
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -799,7 +799,7 @@ FileVerb::perform(SPAction *action, void *data, void */*pdata*/)
             sp_file_import(*parent);
             break;
         case SP_VERB_FILE_EXPORT:
-            sp_file_export_dialog(NULL);
+            sp_file_export_dialog(*parent);
             break;
         case SP_VERB_FILE_IMPORT_FROM_OCAL:
             sp_file_import_from_ocal(*parent);