4 files changed, 16 insertions, 39 deletions

diff --git a/mate-dictionary/libgdict/gdict-client-context.c b/mate-dictionary/libgdict/gdict-client-context.c
index af13e800..1728b474 100644
--- a/mate-dictionary/libgdict/gdict-client-context.c
+++ b/mate-dictionary/libgdict/gdict-client-context.c
@@ -478,11 +478,8 @@ gdict_client_context_finalize (GObject *object)
 
   if (priv->commands_queue)
     {
-      g_queue_foreach (priv->commands_queue,
-                       (GFunc) gdict_command_free,
-                       NULL);
-      g_queue_free (priv->commands_queue);
-
+      g_queue_free_full (priv->commands_queue,
+                         (GDestroyNotify) gdict_command_free);
       priv->commands_queue = NULL;
     }
 
@@ -925,11 +922,8 @@ clear_command_queue (GdictClientContext *context)
 
   if (priv->commands_queue)
     {
-      g_queue_foreach (priv->commands_queue,
-                       (GFunc) gdict_command_free,
-                       NULL);
-
-      g_queue_free (priv->commands_queue);
+      g_queue_free_full (priv->commands_queue,
+                         (GDestroyNotify) gdict_command_free);
     }
 
   /* renew */
diff --git a/mate-dictionary/libgdict/gdict-context.c b/mate-dictionary/libgdict/gdict-context.c
index c9dc1eb4..958dcc93 100644
--- a/mate-dictionary/libgdict/gdict-context.c
+++ b/mate-dictionary/libgdict/gdict-context.c
@@ -50,7 +50,7 @@
 #include "gdict-private.h"
 
 
-static void gdict_context_class_init (gpointer g_iface);
+static void gdict_context_class_init (gpointer g_iface, void *user_data);
 
 
 GType
@@ -79,7 +79,7 @@ gdict_context_get_type (void)
 
 
 static void
-gdict_context_class_init (gpointer g_iface)
+gdict_context_class_init (gpointer g_iface, void *user_data)
 {
   GType iface_type = G_TYPE_FROM_INTERFACE (g_iface);
 
diff --git a/mate-dictionary/libgdict/gdict-defbox.c b/mate-dictionary/libgdict/gdict-defbox.c
index ee48c3e5..49a35e9a 100644
--- a/mate-dictionary/libgdict/gdict-defbox.c
+++ b/mate-dictionary/libgdict/gdict-defbox.c
@@ -215,9 +215,7 @@ gdict_defbox_finalize (GObject *object)
 
   if (priv->definitions)
     {
-      g_slist_foreach (priv->definitions, (GFunc) definition_free, NULL);
-      g_slist_free (priv->definitions);
-
+      g_slist_free_full (priv->definitions, (GDestroyNotify) definition_free);
       priv->definitions = NULL;
     }
 
@@ -2592,11 +2590,7 @@ gdict_defbox_clear (GdictDefbox *defbox)
   /* destroy previously found definitions */
   if (priv->definitions)
     {
-      g_slist_foreach (priv->definitions,
-      		       (GFunc) definition_free,
-      		       NULL);
-      g_slist_free (priv->definitions);
-
+      g_slist_free_full (priv->definitions, (GDestroyNotify) definition_free);
       priv->definitions = NULL;
     }
 
diff --git a/mate-dictionary/libgdict/gdict-source-loader.c b/mate-dictionary/libgdict/gdict-source-loader.c
index f0e7f740..80004d95 100644
--- a/mate-dictionary/libgdict/gdict-source-loader.c
+++ b/mate-dictionary/libgdict/gdict-source-loader.c
@@ -89,11 +89,8 @@ gdict_source_loader_finalize (GObject *object)
 
   if (priv->paths)
     {
-      g_slist_foreach (priv->paths,
-      		       (GFunc) g_free,
-      		       NULL);
-      g_slist_free (priv->paths);
-
+      g_slist_free_full (priv->paths,
+                         g_free);
       priv->paths = NULL;
     }
 
@@ -102,11 +99,8 @@ gdict_source_loader_finalize (GObject *object)
 
   if (priv->sources)
     {
-      g_slist_foreach (priv->sources,
-      		       (GFunc) g_object_unref,
-      		       NULL);
-      g_slist_free (priv->sources);
-
+      g_slist_free_full (priv->sources,
+                         g_object_unref);
       priv->sources = NULL;
     }
 
@@ -222,7 +216,7 @@ gdict_source_loader_init (GdictSourceLoader *loader)
 
   priv->sources = NULL;
   priv->sources_by_name = g_hash_table_new_full (g_str_hash, g_str_equal,
-		  				 (GDestroyNotify) g_free,
+		  				 g_free,
 						 NULL);
 
   /* ensure that the sources list will be updated */
@@ -366,10 +360,8 @@ gdict_source_loader_update_sources (GdictSourceLoader *loader)
 
   g_assert (GDICT_IS_SOURCE_LOADER (loader));
 
-  g_slist_foreach (loader->priv->sources,
-		   (GFunc) g_object_unref,
-		   NULL);
-  g_slist_free (loader->priv->sources);
+  g_slist_free_full (loader->priv->sources,
+                     g_object_unref);
   loader->priv->sources = NULL;
 
   filenames = build_source_filenames (loader);
@@ -404,10 +396,7 @@ gdict_source_loader_update_sources (GdictSourceLoader *loader)
       g_signal_emit (loader, loader_signals[SOURCE_LOADED], 0, source);
     }
 
-  g_slist_foreach (filenames,
-                   (GFunc) g_free,
-                   NULL);
-  g_slist_free (filenames);
+  g_slist_free_full (filenames, g_free);
 
   loader->priv->paths_dirty = FALSE;
 }