summaryrefslogtreecommitdiffstats
path: root/src/ui/clipboard.cpp
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2015-01-21 10:13:17 +0000
committertavmjong-free <tavmjong@free.fr>2015-01-21 10:13:17 +0000
commitd6c1f073a54e1901783415fe1890b2370fbdca05 (patch)
tree1ed8019a88b3f356612ea36c5cac289721075469 /src/ui/clipboard.cpp
parentRemove unnecesary headers from rotate curves (diff)
downloadinkscape-d6c1f073a54e1901783415fe1890b2370fbdca05.tar.gz
inkscape-d6c1f073a54e1901783415fe1890b2370fbdca05.zip
Fix regression: pasted bitmaps should be embeded. (Bug #855440)
(bzr r13867)
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;