summaryrefslogtreecommitdiffstats
path: root/src/ui/clipboard.cpp
diff options
context:
space:
mode:
authorShlomi Fish <shlomif@shlomifish.org>2017-02-28 21:33:57 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2017-02-28 21:33:57 +0000
commitc0ddce54924a89813453185c7a7fc26f0f5217d2 (patch)
treefc51216d99f5fb925e2bd2a9cc4d2c55ac1197c4 /src/ui/clipboard.cpp
parentAdd some comment. Comment out unused signals. (diff)
parentMerged. (diff)
downloadinkscape-c0ddce54924a89813453185c7a7fc26f0f5217d2.tar.gz
inkscape-c0ddce54924a89813453185c7a7fc26f0f5217d2.zip
merge minor refactoring
(bzr r15555)
Diffstat (limited to 'src/ui/clipboard.cpp')
-rw-r--r--src/ui/clipboard.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index 038711861..734640584 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -76,6 +76,7 @@
#include "sp-namedview.h"
#include "persp3d.h"
#include "object-set.h"
+#include "extension/find_extension_by_mime.h"
/// Made up mimetype to represent Gdk::Pixbuf clipboard contents.
#define CLIPBOARD_GDK_PIXBUF_TARGET "image/x-gdk-pixbuf"
@@ -953,15 +954,7 @@ bool ClipboardManagerImpl::_pasteImage(SPDocument *doc)
return false;
}
- // TODO unify with interface.cpp's sp_ui_drag_data_received()
- // AARGH stupid
- Inkscape::Extension::DB::InputList o;
- Inkscape::Extension::db.get_input_list(o);
- Inkscape::Extension::DB::InputList::const_iterator i = o.begin();
- while (i != o.end() && strcmp( (*i)->get_mimetype(), "image/png" ) != 0) {
- ++i;
- }
- Inkscape::Extension::Extension *png = *i;
+ Inkscape::Extension::Extension *png = Inkscape::Extension::find_by_mime("image/png");
Inkscape::Preferences *prefs = Inkscape::Preferences::get();
Glib::ustring attr_saved = prefs->getString("/dialogs/import/link");
bool ask_saved = prefs->getBool("/dialogs/import/ask");