summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan B. C. Engelen <jbc.engelen@swissonline.ch>2013-10-30 22:24:31 +0000
committerJohan B. C. Engelen <j.b.c.engelen@alumnus.utwente.nl>2013-10-30 22:24:31 +0000
commit7fd705fc68b61635f87cf14d02bc557206bfeb8d (patch)
tree18dc8b85dc6864e9e556be8c7b96be67c35e634c /src
parentsuppress uninitialized variables (x and y) warning, don't ask why... g++'s wa... (diff)
downloadinkscape-7fd705fc68b61635f87cf14d02bc557206bfeb8d.tar.gz
inkscape-7fd705fc68b61635f87cf14d02bc557206bfeb8d.zip
fix warnings
(bzr r12752)
Diffstat (limited to 'src')
-rw-r--r--src/extension/system.cpp16
1 files changed, 14 insertions, 2 deletions
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index a4c370f4c..c0211032c 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -592,10 +592,14 @@ get_file_save_extension (Inkscape::Extension::FileSaveMethod method) {
case FILE_SAVE_METHOD_INKSCAPE_SVG:
extension = SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE;
break;
+ case FILE_SAVE_METHOD_EXPORT:
+ /// \todo no default extension set for Export? defaults to SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE is ok?
+ break;
}
- if(extension.empty())
+ if(extension.empty()) {
extension = SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE;
+ }
return extension;
}
@@ -635,13 +639,19 @@ get_file_save_path (SPDocument *doc, FileSaveMethod method) {
// leave this as a choice to the user.
path = prefs->getString("/dialogs/save_as/path");
}
+ break;
+ case FILE_SAVE_METHOD_EXPORT:
+ /// \todo no default path set for Export?
+ // defaults to g_get_home_dir()
+ break;
}
- if(path.empty())
+ if(path.empty()) {
path = g_get_home_dir(); // Is this the most sensible solution? Note that we should avoid
// g_get_current_dir because this leads to problems on OS X where
// Inkscape opens the dialog inside application bundle when it is
// invoked for the first teim.
+ }
return path;
}
@@ -658,6 +668,7 @@ store_file_extension_in_prefs (Glib::ustring extension, FileSaveMethod method) {
prefs->setString("/dialogs/save_copy/default", extension);
break;
case FILE_SAVE_METHOD_INKSCAPE_SVG:
+ case FILE_SAVE_METHOD_EXPORT:
// do nothing
break;
}
@@ -675,6 +686,7 @@ store_save_path_in_prefs (Glib::ustring path, FileSaveMethod method) {
prefs->setString("/dialogs/save_copy/path", path);
break;
case FILE_SAVE_METHOD_INKSCAPE_SVG:
+ case FILE_SAVE_METHOD_EXPORT:
// do nothing
break;
}