summaryrefslogtreecommitdiffstats
path: root/src/ui/clipboard.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-01-24 09:58:32 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-01-24 09:58:32 +0000
commite670856c8810c2733ce95e5f31c822cf20030367 (patch)
treeff3d2c135a871bf5a66a066ee8bd58fa602559cd /src/ui/clipboard.cpp
parentAdded the remove for outer staff to kaleidoscope (diff)
parent* [INTL:sk] Slovak translation update (diff)
downloadinkscape-e670856c8810c2733ce95e5f31c822cf20030367.tar.gz
inkscape-e670856c8810c2733ce95e5f31c822cf20030367.zip
update to trunk
(bzr r13708.1.13)
Diffstat (limited to 'src/ui/clipboard.cpp')
-rw-r--r--src/ui/clipboard.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index dabebe1be..94a1eb2dc 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -936,15 +936,18 @@ bool ClipboardManagerImpl::_pasteImage(SPDocument *doc)
}
Inkscape::Extension::Extension *png = *i;
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- Glib::ustring attr = prefs->getString("/dialogs/import/link");
+ Glib::ustring attr_saved = prefs->getString("/dialogs/import/link");
+ bool ask_saved = prefs->getBool("/dialogs/import/ask");
prefs->setString("/dialogs/import/link", "embed");
+ prefs->setBool("/dialogs/import/ask", false);
png->set_gui(false);
gchar *filename = g_build_filename( g_get_tmp_dir(), "inkscape-clipboard-import", NULL );
img->save(filename, "png");
file_import(doc, filename, png);
g_free(filename);
- prefs->setString("/dialogs/import/link", attr);
+ prefs->setString("/dialogs/import/link", attr_saved);
+ prefs->setBool("/dialogs/import/ask", ask_saved);
png->set_gui(true);
return true;