2 files changed, 6 insertions, 22 deletions
diff --git a/src/extension/init.cpp b/src/extension/init.cpp
index 9830b0176..699c0382f 100644
--- a/src/extension/init.cpp
+++ b/src/extension/init.cpp
@@ -130,20 +130,9 @@ static void check_extensions();
  */
 static void
 update_pref(Glib::ustring const &pref_path,
-            gchar const *pref_default) // , GSList *extension_family)
+            gchar const *pref_default) 
 {
     Glib::ustring pref = Inkscape::Preferences::get()->getString(pref_path);
-    /*
-    gboolean missing=TRUE;
-    for (GSList *list = extension_family; list; list = g_slist_next(list)) {
-        g_assert( list->data );
-
-        Inkscape::Extension *extension;
-        extension = reinterpret_cast<Inkscape::Extension *>(list->data);
-
-        if (!strcmp(extension->get_id(),pref)) missing=FALSE;
-    }
-    */
     if (!Inkscape::Extension::db.get( pref.data() ) /*missing*/) {
         Inkscape::Preferences::get()->setString(pref_path, pref_default);
     }
diff --git a/src/extension/internal/gdkpixbuf-input.cpp b/src/extension/internal/gdkpixbuf-input.cpp
index e0dc90981..7af7927f2 100644
--- a/src/extension/internal/gdkpixbuf-input.cpp
+++ b/src/extension/internal/gdkpixbuf-input.cpp
@@ -1,4 +1,6 @@
 #include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gdkmm/pixbuf.h>
+#include <gdkmm/pixbufformat.h>
 
 #include <boost/scoped_ptr.hpp>
 #include <glib/gprintf.h>
@@ -163,14 +165,9 @@ GdkpixbufInput::open(Inkscape::Extension::Input *mod, char const *uri)
 void
 GdkpixbufInput::init(void)
 {
-    GSList * formatlist, * formatlisthead;
-
-    /* \todo I'm not sure if I need to free this list */
-    for (formatlist = formatlisthead = gdk_pixbuf_get_formats();
-         formatlist != NULL;
-         formatlist = g_slist_next(formatlist)) {
-
-        GdkPixbufFormat *pixformat = (GdkPixbufFormat *)formatlist->data;
+    static std::vector< Gdk::PixbufFormat > formatlist = Gdk::Pixbuf::get_formats();
+    for (auto i: formatlist) {
+        GdkPixbufFormat *pixformat = i.gobj();
 
         gchar *name =        gdk_pixbuf_format_get_name(pixformat);
         gchar *description = gdk_pixbuf_format_get_description(pixformat);
@@ -240,8 +237,6 @@ GdkpixbufInput::init(void)
         g_strfreev(mimetypes);
         g_strfreev(extensions);
     }
-
-    g_slist_free(formatlisthead);
 }
 
 } } }  /* namespace Inkscape, Extension, Implementation */