summaryrefslogtreecommitdiff
path: root/mate-dictionary
diff options
context:
space:
mode:
Diffstat (limited to 'mate-dictionary')
-rw-r--r--mate-dictionary/libgdict/gdict-client-context.c14
-rw-r--r--mate-dictionary/libgdict/gdict-context.c4
-rw-r--r--mate-dictionary/libgdict/gdict-defbox.c10
-rw-r--r--mate-dictionary/libgdict/gdict-source-loader.c27
-rw-r--r--mate-dictionary/src/gdict-app.c13
-rw-r--r--mate-dictionary/src/gdict-sidebar.c5
6 files changed, 21 insertions, 52 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;
}
diff --git a/mate-dictionary/src/gdict-app.c b/mate-dictionary/src/gdict-app.c
index cd751baa..a8b79b38 100644
--- a/mate-dictionary/src/gdict-app.c
+++ b/mate-dictionary/src/gdict-app.c
@@ -61,16 +61,9 @@ gdict_app_finalize (GObject *object)
app->current_window = NULL;
- g_slist_foreach (app->windows,
- (GFunc) gtk_widget_destroy,
- NULL);
- g_slist_free (app->windows);
-
- g_slist_foreach (app->lookup_words, (GFunc) g_free, NULL);
- g_slist_free (app->lookup_words);
-
- g_slist_foreach (app->match_words, (GFunc) g_free, NULL);
- g_slist_free (app->match_words);
+ g_slist_free_full (app->windows, (GDestroyNotify) gtk_widget_destroy);
+ g_slist_free_full (app->lookup_words, g_free);
+ g_slist_free_full (app->match_words, g_free);
g_free (app->database);
g_free (app->source_name);
diff --git a/mate-dictionary/src/gdict-sidebar.c b/mate-dictionary/src/gdict-sidebar.c
index f2b46d5c..b903677c 100644
--- a/mate-dictionary/src/gdict-sidebar.c
+++ b/mate-dictionary/src/gdict-sidebar.c
@@ -116,8 +116,7 @@ gdict_sidebar_finalize (GObject *object)
if (priv->pages)
{
- g_slist_foreach (priv->pages, (GFunc) sidebar_page_free, NULL);
- g_slist_free (priv->pages);
+ g_slist_free_full (priv->pages, (GDestroyNotify) sidebar_page_free);
}
G_OBJECT_CLASS (gdict_sidebar_parent_class)->finalize (object);
@@ -419,7 +418,7 @@ gdict_sidebar_add_page (GdictSidebar *sidebar,
g_object_set_qdata_full (G_OBJECT (menu_item),
sidebar_page_id_quark,
g_strdup (page_id),
- (GDestroyNotify) g_free);
+ g_free);
g_signal_connect (menu_item, "activate",
G_CALLBACK (gdict_sidebar_menu_item_activate),
sidebar);
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-27 13:35:53 +0000