Hunted every GList to the last (except in libnrtype and libcroco)

5 files changed, 21 insertions, 30 deletions

diff --git a/src/ui/dialog/clonetiler.cpp b/src/ui/dialog/clonetiler.cpp
index ad13ed8c4..5c9b31fb1 100644
--- a/src/ui/dialog/clonetiler.cpp
+++ b/src/ui/dialog/clonetiler.cpp
@@ -2639,11 +2639,10 @@ void CloneTiler::reset_recursive(GtkWidget *w)
     }
 
     if (GTK_IS_CONTAINER(w)) {
-        GList *ch = gtk_container_get_children (GTK_CONTAINER(w));
-        for (GList *i = ch; i != NULL; i = i->next) {
-            reset_recursive (GTK_WIDGET(i->data));
+        std::vector<Gtk::Widget*> c = Glib::wrap(GTK_CONTAINER(w))->get_children();
+        for ( auto i : c ) {
+            reset_recursive(i->gobj());
         }
-        g_list_free (ch);
     }
 }
 
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 13729cf0f..d87a3d94a 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -22,6 +22,8 @@
 #include <glibmm/miscutils.h>
 #include <glibmm/markup.h>
 #include <gtkmm/main.h>
+#include <gtkmm/recentmanager.h>
+#include <gtkmm/recentinfo.h>
 
 #include "preferences.h"
 #include "verbs.h"
@@ -2057,21 +2059,15 @@ bool InkscapePreferences::PresentPage(const Gtk::TreeModel::iterator& iter)
 
 void InkscapePreferences::on_reset_open_recent_clicked()
 {
-    GtkRecentManager* manager = gtk_recent_manager_get_default();
-    GList* recent_list = gtk_recent_manager_get_items(manager);
-    GList* element;
-    GError* error;
+    Glib::RefPtr<Gtk::RecentManager> manager = Gtk::RecentManager::get_default();
+    std::vector< Glib::RefPtr< Gtk::RecentInfo > > recent_list = manager->get_items();
 
     //Remove only elements that were added by Inkscape
-    for (element = g_list_first(recent_list); element; element = g_list_next(element)){
-        error = NULL;
-        GtkRecentInfo* info = (GtkRecentInfo*) element->data;
-        if (gtk_recent_info_has_application(info, g_get_prgname())){
-            gtk_recent_manager_remove_item(manager, gtk_recent_info_get_uri(info), &error);
+    for (auto e : recent_list) {
+        if (e->has_application(g_get_prgname())) {
+            manager->remove_item(e->get_uri());
         }
-        gtk_recent_info_unref (info);
     }
-    g_list_free(recent_list);
 }
 
 void InkscapePreferences::on_pagelist_selection_changed()
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 93e91b8f8..7a9b92378 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -1436,14 +1436,12 @@ sp_ui_menu_item_set_name(GtkWidget *data, Glib::ustring const &name)
             if (GTK_IS_LABEL(child)) {
                 gtk_label_set_markup_with_mnemonic(GTK_LABEL (child), name.c_str());
             } else if (GTK_IS_BOX(child)) {
-                GList *children = gtk_container_get_children(GTK_CONTAINER(child));
+                std::vector<Gtk::Widget*> children = Glib::wrap(GTK_CONTAINER(child))->get_children();
 
                 // Label is second child in list
-                GtkWidget *label = GTK_WIDGET(children->next->data);
-
-                gtk_label_set_markup_with_mnemonic(
-                GTK_LABEL (label),
-                name.c_str());
+                Gtk::Label *label = dynamic_cast<Gtk::Label*>(children[1]);
+                if(!label) return;
+                label->set_markup_with_mnemonic(name);
             }//else sp_ui_menu_append_item_from_verb has been modified and can set
             //a menu item in yet another way...
         }
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index eb0e45f14..7427ad4e2 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -355,13 +355,12 @@ PageSizer::PageSizer(Registry & _wr)
     _fitPageMarginExpander.set_vexpand();
     _customDimTable.attach(_fitPageMarginExpander, 0, 2, 2, 1);
     
-    _dimTabOrderGList = NULL;
-    _dimTabOrderGList = g_list_append(_dimTabOrderGList, _dimensionWidth.gobj());
-    _dimTabOrderGList = g_list_append(_dimTabOrderGList, _dimensionHeight.gobj());
-    _dimTabOrderGList = g_list_append(_dimTabOrderGList, _dimensionUnits.gobj());
-    _dimTabOrderGList = g_list_append(_dimTabOrderGList, _fitPageMarginExpander.gobj());
-    Glib::ListHandle<Widget *> dimFocusChain(_dimTabOrderGList, Glib::OWNERSHIP_NONE);
-    _customDimTable.set_focus_chain(dimFocusChain);    
+    _dimTabOrderList.clear();
+    _dimTabOrderList.push_back(&_dimensionWidth);
+    _dimTabOrderList.push_back(&_dimensionHeight);
+    _dimTabOrderList.push_back(&_dimensionUnits);
+    _dimTabOrderList.push_back(&_fitPageMarginExpander);
+    _customDimTable.set_focus_chain(_dimTabOrderList);    
 
     //## Set up fit page expander
     _fitPageMarginExpander.set_use_underline();
@@ -454,7 +453,6 @@ PageSizer::PageSizer(Registry & _wr)
  */
 PageSizer::~PageSizer()
 {
-    g_list_free(_dimTabOrderGList);
 }
 
 
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index f84f96782..329ecfc6d 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -220,7 +220,7 @@ protected:
     RegisteredUnitMenu   _dimensionUnits;
     RegisteredScalarUnit _dimensionWidth;
     RegisteredScalarUnit _dimensionHeight;
-    GList *              _dimTabOrderGList;
+    std::vector<Widget*> _dimTabOrderList;
 
     //### Fit Page options
     Gtk::Expander        _fitPageMarginExpander;