merge minor refactoring

(bzr r15555)

3 files changed, 8 insertions, 20 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");
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index d50c56b76..5e85065d1 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -72,6 +72,7 @@
 #include "sp-mask.h"
 #include "message-stack.h"
 #include "ui/dialog/layer-properties.h"
+#include "extension/find_extension_by_mime.h"
 
 using Inkscape::DocumentUndo;
 
@@ -1234,15 +1235,7 @@ sp_ui_drag_data_received(GtkWidget *widget,
         case PNG_DATA:
         case JPEG_DATA:
         case IMAGE_DATA: {
-            const char *mime = (info == JPEG_DATA ? "image/jpeg" : "image/png");
-
-            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(), mime ) != 0) {
-                ++i;
-            }
-            Inkscape::Extension::Extension *ext = *i;
+            Inkscape::Extension::Extension *ext = Inkscape::Extension::find_by_mime((info == JPEG_DATA ? "image/jpeg" : "image/png"));
             bool save = (strcmp(ext->get_param_optiongroup("link"), "embed") == 0);
             ext->set_param_optiongroup("link", "embed");
             ext->set_gui(false);
diff --git a/src/ui/tools/freehand-base.h b/src/ui/tools/freehand-base.h
index a3e7b42f9..3ee4cd7d0 100644
--- a/src/ui/tools/freehand-base.h
+++ b/src/ui/tools/freehand-base.h
@@ -76,8 +76,10 @@ public:
     GSList *white_curves;
     GSList *white_anchors;
 
-    //ALternative curve to use on continuing exisiting curve in case of bspline or spirolive 
-    //because usigh anchor curves give memory and random bugs, - and obscure code- in some plataform reported by su_v in mac
+    // Alternative curve to use on continuing the exisiting curve in case of
+    // bspline or spirolive, because using anchor curves gives random memory
+    // bugs as reported by su_v when running this code on macOS (as well as
+    // making the code hard to understand).
     SPCurve *overwrite_curve;
 
     // Start anchor