all: Stop using g_slice, fix a leak and remove an obsolete

mtwebster · mtwebster · commit 981c9ed2f155 · 2024-02-06T13:31:31.000-05:00
workaround.

g_slice is deprecated as of glib 2.62 and is just a wrapper around
the g_new/g_free family.
diff --git a/libnemo-private/nemo-bookmark.c b/libnemo-private/nemo-bookmark.c
@@ -829,7 +829,7 @@ nemo_bookmark_get_current_metadata (NemoBookmark *bookmark)
 NemoBookmarkMetadata *
 nemo_bookmark_metadata_new (void)
 {
-    NemoBookmarkMetadata *meta = g_slice_new0 (NemoBookmarkMetadata);
+    NemoBookmarkMetadata *meta = g_new0 (NemoBookmarkMetadata, 1);
 
     return meta;
 }
@@ -873,5 +873,5 @@ nemo_bookmark_metadata_free (NemoBookmarkMetadata *metadata)
     g_free (metadata->bookmark_name);
     g_strfreev (metadata->emblems);
 
-    g_slice_free (NemoBookmarkMetadata, metadata);
+    g_free (metadata);
 }
diff --git a/libnemo-private/nemo-clipboard-monitor.c b/libnemo-private/nemo-clipboard-monitor.c
@@ -101,7 +101,7 @@ nemo_clipboard_info_new (GList *files,
 {
 	NemoClipboardInfo *info;
 
-	info = g_slice_new0 (NemoClipboardInfo);
+	info = g_new0 (NemoClipboardInfo, 1);
 	info->files = nemo_file_list_copy (files);
 	info->cut = cut;
 
@@ -128,7 +128,7 @@ nemo_clipboard_info_free (NemoClipboardInfo *info)
 {
 	nemo_file_list_free (info->files);
 
-	g_slice_free (NemoClipboardInfo, info);
+	g_free (info);
 }
 
 static void
diff --git a/libnemo-private/nemo-file-operations.c b/libnemo-private/nemo-file-operations.c
@@ -4328,13 +4328,13 @@ run_conflict_dialog (CommonJob *job,
 
 	g_timer_stop (job->time);
 
-	data = g_slice_new0 (ConflictDialogData);
+	data = g_new0 (ConflictDialogData, 1);
 	data->parent = job->parent_window;
 	data->src = src;
 	data->dest = dest;
 	data->dest_dir = dest_dir;
 
-	resp_data = g_slice_new0 (ConflictResponseData);
+	resp_data = g_new0 (ConflictResponseData, 1);
 	resp_data->new_name = NULL;
 	data->resp_data = resp_data;
 
@@ -4345,7 +4345,7 @@ run_conflict_dialog (CommonJob *job,
 					     NULL);
 	nemo_progress_info_resume (job->progress);
 
-	g_slice_free (ConflictDialogData, data);
+	g_free (data);
 
 	g_timer_continue (job->time);
 
@@ -4356,7 +4356,7 @@ static void
 conflict_response_data_free (ConflictResponseData *data)
 {
 	g_free (data->new_name);
-	g_slice_free (ConflictResponseData, data);
+	g_free (data);
 }
 
 static GFile *
@@ -6211,7 +6211,7 @@ callback_for_move_to_trash (GHashTable *debuting_uris,
 {
 	if (data->real_callback)
 		data->real_callback (debuting_uris, !user_cancelled, data->real_data);
-	g_slice_free (MoveTrashCBData, data);
+	g_free (data);
 }
 
 void
@@ -6286,7 +6286,7 @@ nemo_file_operations_copy_move (const GList *item_uris,
 		if (g_file_has_uri_scheme (dest, "trash")) {
 			MoveTrashCBData *cb_data;
 
-			cb_data = g_slice_new0 (MoveTrashCBData);
+			cb_data = g_new0 (MoveTrashCBData, 1);
 			cb_data->real_callback = done_callback;
 			cb_data->real_data = done_callback_data;
 
diff --git a/libnemo-private/nemo-file-undo-operations.c b/libnemo-private/nemo-file-undo-operations.c
@@ -241,7 +241,7 @@ typedef struct {
 static void
 file_undo_info_op_res_free (gpointer data)
 {
-	g_slice_free (FileUndoInfoOpRes, data);
+	g_free (data);
 }
 
 gboolean
@@ -279,7 +279,7 @@ file_undo_info_complete_apply (NemoFileUndoInfo *self,
 			       gboolean success,
 			       gboolean user_cancel)
 {
-	FileUndoInfoOpRes *op_res = g_slice_new0 (FileUndoInfoOpRes);
+	FileUndoInfoOpRes *op_res = g_new0 (FileUndoInfoOpRes, 1);
 
 	op_res->user_cancel = user_cancel;
 	op_res->success = success;
diff --git a/libnemo-private/nemo-file-utilities.c b/libnemo-private/nemo-file-utilities.c
@@ -1318,7 +1318,7 @@ ensure_dirs_task_ready_cb (GObject *_source,
 	g_list_free (original_dirs);
 
 	g_hash_table_unref (data->original_dirs_hash);
-	g_slice_free (RestoreFilesData, data);
+	g_free (data);
 }
 
 static void
@@ -1351,7 +1351,7 @@ restore_files_ensure_parent_directories (GHashTable *original_dirs_hash,
 	RestoreFilesData *data;
 	GTask *ensure_dirs_task;
 
-	data = g_slice_new0 (RestoreFilesData);
+	data = g_new0 (RestoreFilesData, 1);
 	data->parent_window = parent_window;
 	data->original_dirs_hash = g_hash_table_ref (original_dirs_hash);
 
@@ -1417,7 +1417,7 @@ get_types_cb (GObject *source_object,
 		data->callback ((const char **) types, data->user_data);
 	}
 	g_strfreev (types);
-	g_slice_free (GetContentTypesData, data);
+	g_free (data);
 }
 
 void
@@ -1444,7 +1444,7 @@ nemo_get_x_content_types_for_mount_async (GMount *mount,
 		return;
 	}
 
-	data = g_slice_new0 (GetContentTypesData);
+	data = g_new0 (GetContentTypesData, 1);
 	data->callback = callback;
 	data->user_data = user_data;
 
diff --git a/libnemo-private/nemo-icon-container.c b/libnemo-private/nemo-icon-container.c
@@ -2781,7 +2781,7 @@ finalize (GObject *object)
 		g_source_remove (details->a11y_item_action_idle_handler);
 	}
 
-    g_slice_free (NemoViewLayoutConstants, details->view_constants);
+    g_free (details->view_constants);
 
     g_list_free (details->current_selection);
     g_free(details);
@@ -4920,7 +4920,7 @@ nemo_icon_container_init (NemoIconContainer *container)
 
     details->fixed_text_height = -1;
 
-    details->view_constants = g_slice_new0 (NemoViewLayoutConstants);
+    details->view_constants = g_new0 (NemoViewLayoutConstants, 1);
 
 	container->details = details;
 
diff --git a/libnemo-private/nemo-icon-info.c b/libnemo-private/nemo-icon-info.c
@@ -61,8 +61,7 @@ nemo_icon_info_free (NemoIconInfo *icon)
     }
 
     g_free (icon->icon_name);
-
-    g_slice_free (NemoIconInfo, icon);
+    g_free (icon);
 }
 
 NemoIconInfo *
@@ -106,7 +105,7 @@ nemo_icon_info_create (void)
 {
     NemoIconInfo *icon;
 
-    icon = g_slice_new0 (NemoIconInfo);
+    icon = g_new0 (NemoIconInfo, 1);
 
 	icon->last_use_time = g_get_monotonic_time ();
 	icon->sole_owner = TRUE;
@@ -270,7 +269,7 @@ icon_key_new (GIcon *icon, int size)
 {
 	IconKey *key;
 
-	key = g_slice_new (IconKey);
+	key = g_new0 (IconKey, 1);
 	key->icon = g_object_ref (icon);
 	key->size = size;
 
@@ -281,7 +280,7 @@ static void
 icon_key_free (IconKey *key)
 {
 	g_object_unref (key->icon);
-	g_slice_free (IconKey, key);
+	g_free (key);
 }
 
 NemoIconInfo *
diff --git a/libnemo-private/nemo-job-queue.c b/libnemo-private/nemo-job-queue.c
@@ -163,7 +163,7 @@ job_finished_cb (NemoJobQueue *self,
     self->priv->running_jobs = g_list_remove (self->priv->running_jobs, job);
     self->priv->queued_jobs = g_list_remove (self->priv->queued_jobs, job);
 
-    g_slice_free (Job, job);
+    g_free (job);
 
     nemo_job_queue_start_next_job (self);
 }
@@ -189,7 +189,7 @@ nemo_job_queue_add_new_job (NemoJobQueue         *self,
 		return;
 	}
 
-    Job *new_job = g_slice_new0 (Job);
+    Job *new_job = g_new0 (Job, 1);
     new_job->job_func = job_func;
     new_job->user_data = user_data;
     new_job->cancellable = cancellable;
diff --git a/libnemo-private/nemo-search-engine-advanced.c b/libnemo-private/nemo-search-engine-advanced.c
@@ -92,7 +92,7 @@ static void
 search_helper_free (SearchHelper *helper)
 {
     g_free (helper->exec_format);
-    g_slice_free (SearchHelper, helper);
+    g_free (helper);
 }
 
 static GList *
@@ -220,7 +220,7 @@ process_search_helper_file (const gchar *path)
             DEBUG ("Replacing existing nemo search_helper for '%s' with %s based on priority.", mime_type, path);
         }
 
-        helper = g_slice_new0 (SearchHelper);
+        helper = g_new0 (SearchHelper, 1);
         helper->exec_format = g_strdup (exec_format);
         helper->priority = priority;
 
diff --git a/libnemo-private/nemo-search-engine.c b/libnemo-private/nemo-search-engine.c
@@ -180,7 +180,7 @@ static GHashTable *fsr_accounting_table = NULL;
 FileSearchResult *
 file_search_result_new (gchar *uri, gchar *snippet)
 {
-    FileSearchResult *ret = g_slice_new0 (FileSearchResult);
+    FileSearchResult *ret = g_new0 (FileSearchResult, 1);
 
     ret->uri = uri;
     ret->snippet = snippet;
@@ -215,7 +215,7 @@ file_search_result_free (FileSearchResult *res)
 
     g_free (res->uri);
     g_free (res->snippet);
-    g_slice_free (FileSearchResult, res);
+    g_free (res);
 }
 
 void
diff --git a/src/nemo-action-config-widget.c b/src/nemo-action-config-widget.c
@@ -35,7 +35,7 @@ action_proxy_free (ActionProxy *proxy)
     g_clear_pointer (&proxy->stock_id, g_free);
     g_clear_pointer (&proxy->icon_name, g_free);
     g_clear_pointer (&proxy->filename, g_free);
-    g_slice_free (ActionProxy, proxy);
+    g_free (proxy);
 }
 
 static GtkWidget *
@@ -114,7 +114,7 @@ make_action_proxy (const gchar *filename, const gchar *fullpath)
         }
     }
 
-    ActionProxy *proxy = g_slice_new0 (ActionProxy);
+    ActionProxy *proxy = g_new0 (ActionProxy, 1);
 
     gchar *name = g_key_file_get_locale_string (key_file,
                                                 ACTION_FILE_GROUP,
diff --git a/src/nemo-desktop-manager.c b/src/nemo-desktop-manager.c
@@ -101,7 +101,7 @@ free_info (DesktopInfo *info)
     g_return_if_fail (info != NULL);
 
     g_clear_pointer (&info->window, gtk_widget_destroy);
-    g_slice_free (DesktopInfo, info);
+    g_free (info);
 }
 
 static RunState
@@ -308,7 +308,7 @@ create_new_desktop_window (NemoDesktopManager *manager,
     FETCH_PRIV (manager);
     GtkWidget *window;
 
-    DesktopInfo *info = g_slice_new0 (DesktopInfo);
+    DesktopInfo *info = g_new0 (DesktopInfo, 1);
 
     info->monitor_num = monitor;
     info->shows_desktop = show_desktop;
diff --git a/src/nemo-extension-config-widget.c b/src/nemo-extension-config-widget.c
@@ -30,7 +30,7 @@ extension_proxy_free (ExtensionProxy *proxy)
     g_clear_pointer (&proxy->display_name, g_free);
     g_clear_pointer (&proxy->desc, g_free);
     g_clear_pointer (&proxy->config_exec, g_free);
-    g_slice_free (ExtensionProxy, proxy);
+    g_free (proxy);
 }
 
 static void
@@ -160,7 +160,7 @@ detect_extensions (NemoExtensionConfigWidget *widget)
             guint i;
             for (i = 0; i < g_strv_length (lines); i++) {
                 if (g_str_has_prefix (lines[i], LINE_PREFIX)) {
-                    ExtensionProxy *p = g_slice_new0 (ExtensionProxy);
+                    ExtensionProxy *p = g_new0 (ExtensionProxy, 1);
 
                     gchar **split = g_strsplit (lines[i] + LINE_PREFIX_LEN, ":::", -1);
                     gint len = g_strv_length (split);
diff --git a/src/nemo-places-sidebar.c b/src/nemo-places-sidebar.c
@@ -404,7 +404,7 @@ new_place_info (PlaceType place_type,
                 gint df_percent,
                 gboolean show_df_percent)
 {
-    PlaceInfo *info = g_slice_new0 (PlaceInfo);
+    PlaceInfo *info = g_new0 (PlaceInfo, 1);
 
     info->place_type = place_type;
     info->section_type = section_type;
@@ -433,7 +433,7 @@ free_place_info (PlaceInfo *info)
     g_clear_object (&info->mount);
     g_free (info->tooltip);
 
-    g_slice_free (PlaceInfo, info);
+    g_free (info);
 }
 
 static GtkTreeIter
diff --git a/src/nemo-progress-ui-handler.c b/src/nemo-progress-ui-handler.c
@@ -385,7 +385,7 @@ timeout_data_free (TimeoutData *data)
 	g_clear_object (&data->self);
 	g_clear_object (&data->info);
 
-	g_slice_free (TimeoutData, data);
+	g_free (data);
 }
 
 static TimeoutData *
@@ -394,7 +394,7 @@ timeout_data_new (NemoProgressUIHandler *self,
 {
 	TimeoutData *retval;
 
-	retval = g_slice_new0 (TimeoutData);
+	retval = g_new0 (TimeoutData, 1);
 	retval->self = g_object_ref (self);
 	retval->info = g_object_ref (info);
 
diff --git a/src/nemo-script-config-widget.c b/src/nemo-script-config-widget.c
@@ -26,7 +26,8 @@ typedef struct {
 static void
 script_proxy_free (ScriptProxy *proxy)
 {
-    g_clear_pointer (&proxy->name, g_free);
+    g_free (proxy->name);
+    g_free (proxy);
 }
 
 static GtkWidget *
@@ -113,7 +114,7 @@ populate_from_directory (NemoScriptConfigWidget *widget, const gchar *path)
                 continue;
             }
 
-            ScriptProxy *p = g_slice_new0 (ScriptProxy);
+            ScriptProxy *p = g_new0 (ScriptProxy, 1);
             p->name = g_strdup (name);
             p->widget = widget;
 
diff --git a/src/nemo-view-dnd.c b/src/nemo-view-dnd.c
@@ -147,7 +147,7 @@ handle_netscape_url_drop_link_cb (GObject *source_object,
 	g_free (data->target_uri);
 
 	g_object_unref (data->view);
-	g_slice_free (NetscapeUrlDropLink, data);
+	g_free (data);
 }
 
 void
@@ -220,7 +220,7 @@ nemo_view_handle_netscape_url_drop (NemoView  *view,
 		if (g_strcmp0 (link_name, NULL) != 0) {
 			NetscapeUrlDropLink *data;
 
-			data = g_slice_new0 (NetscapeUrlDropLink);
+			data = g_new0 (NetscapeUrlDropLink, 1);
 			data->link_name = link_name;
 			data->point.x = x;
 			data->point.y = y;
diff --git a/src/nemo-window-slot-dnd.c b/src/nemo-window-slot-dnd.c
@@ -137,7 +137,7 @@ drag_info_free (gpointer user_data)
   g_clear_object (&drag_info->target_slot);
   g_clear_pointer (&drag_info->desktop_dnd_source_fs, g_free);
 
-  g_slice_free (NemoDragSlotProxyInfo, drag_info);
+  g_free (drag_info);
 }
 
 static void
@@ -332,7 +332,7 @@ nemo_drag_slot_proxy_init (GtkWidget *widget,
 
   g_assert (GTK_IS_WIDGET (widget));
 
-  drag_info = g_slice_new0 (NemoDragSlotProxyInfo);
+  drag_info = g_new0 (NemoDragSlotProxyInfo, 1);
 
   g_object_set_data_full (G_OBJECT (widget), "drag-slot-proxy-data", drag_info,
                           drag_info_free);
diff --git a/src/nemo-window-slot.c b/src/nemo-window-slot.c
diff --git a/src/nemo-window.c b/src/nemo-window.c

Original file line number	Diff line number	Diff line change
`@@ -829,7 +829,7 @@ nemo_bookmark_get_current_metadata (NemoBookmark *bookmark)`
`829`	`829`	`NemoBookmarkMetadata *`
`830`	`830`	`nemo_bookmark_metadata_new (void)`
`831`	`831`	`{`
`832`		`- NemoBookmarkMetadata *meta = g_slice_new0 (NemoBookmarkMetadata);`
	`832`	`+ NemoBookmarkMetadata *meta = g_new0 (NemoBookmarkMetadata, 1);`
`833`	`833`
`834`	`834`	`return meta;`
`835`	`835`	`}`
`@@ -873,5 +873,5 @@ nemo_bookmark_metadata_free (NemoBookmarkMetadata *metadata)`
`873`	`873`	`g_free (metadata->bookmark_name);`
`874`	`874`	`g_strfreev (metadata->emblems);`
`875`	`875`
`876`		`- g_slice_free (NemoBookmarkMetadata, metadata);`
	`876`	`+ g_free (metadata);`
`877`	`877`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ nemo_clipboard_info_new (GList *files,`
`101`	`101`	`{`
`102`	`102`	`NemoClipboardInfo *info;`
`103`	`103`
`104`		`- info = g_slice_new0 (NemoClipboardInfo);`
	`104`	`+ info = g_new0 (NemoClipboardInfo, 1);`
`105`	`105`	`info->files = nemo_file_list_copy (files);`
`106`	`106`	`info->cut = cut;`
`107`	`107`
`@@ -128,7 +128,7 @@ nemo_clipboard_info_free (NemoClipboardInfo *info)`
`128`	`128`	`{`
`129`	`129`	`nemo_file_list_free (info->files);`
`130`	`130`
`131`		`- g_slice_free (NemoClipboardInfo, info);`
	`131`	`+ g_free (info);`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`static void`
Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ typedef struct {`
`241`	`241`	`static void`
`242`	`242`	`file_undo_info_op_res_free (gpointer data)`
`243`	`243`	`{`
`244`		`- g_slice_free (FileUndoInfoOpRes, data);`
	`244`	`+ g_free (data);`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`gboolean`
`@@ -279,7 +279,7 @@ file_undo_info_complete_apply (NemoFileUndoInfo *self,`
`279`	`279`	`gboolean success,`
`280`	`280`	`gboolean user_cancel)`
`281`	`281`	`{`
`282`		`- FileUndoInfoOpRes *op_res = g_slice_new0 (FileUndoInfoOpRes);`
	`282`	`+ FileUndoInfoOpRes *op_res = g_new0 (FileUndoInfoOpRes, 1);`
`283`	`283`
`284`	`284`	`op_res->user_cancel = user_cancel;`
`285`	`285`	`op_res->success = success;`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ nemo_icon_info_free (NemoIconInfo *icon)`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`g_free (icon->icon_name);`
`64`		`-`
`65`		`- g_slice_free (NemoIconInfo, icon);`
	`64`	`+ g_free (icon);`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`NemoIconInfo *`
`@@ -106,7 +105,7 @@ nemo_icon_info_create (void)`
`106`	`105`	`{`
`107`	`106`	`NemoIconInfo *icon;`
`108`	`107`
`109`		`- icon = g_slice_new0 (NemoIconInfo);`
	`108`	`+ icon = g_new0 (NemoIconInfo, 1);`
`110`	`109`
`111`	`110`	`icon->last_use_time = g_get_monotonic_time ();`
`112`	`111`	`icon->sole_owner = TRUE;`
`@@ -270,7 +269,7 @@ icon_key_new (GIcon *icon, int size)`
`270`	`269`	`{`
`271`	`270`	`IconKey *key;`
`272`	`271`
`273`		`- key = g_slice_new (IconKey);`
	`272`	`+ key = g_new0 (IconKey, 1);`
`274`	`273`	`key->icon = g_object_ref (icon);`
`275`	`274`	`key->size = size;`
`276`	`275`
`@@ -281,7 +280,7 @@ static void`
`281`	`280`	`icon_key_free (IconKey *key)`
`282`	`281`	`{`
`283`	`282`	`g_object_unref (key->icon);`
`284`		`- g_slice_free (IconKey, key);`
	`283`	`+ g_free (key);`
`285`	`284`	`}`
`286`	`285`
`287`	`286`	`NemoIconInfo *`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ job_finished_cb (NemoJobQueue *self,`
`163`	`163`	`self->priv->running_jobs = g_list_remove (self->priv->running_jobs, job);`
`164`	`164`	`self->priv->queued_jobs = g_list_remove (self->priv->queued_jobs, job);`
`165`	`165`
`166`		`- g_slice_free (Job, job);`
	`166`	`+ g_free (job);`
`167`	`167`
`168`	`168`	`nemo_job_queue_start_next_job (self);`
`169`	`169`	`}`
`@@ -189,7 +189,7 @@ nemo_job_queue_add_new_job (NemoJobQueue *self,`
`189`	`189`	`return;`
`190`	`190`	`}`
`191`	`191`
`192`		`- Job *new_job = g_slice_new0 (Job);`
	`192`	`+ Job *new_job = g_new0 (Job, 1);`
`193`	`193`	`new_job->job_func = job_func;`
`194`	`194`	`new_job->user_data = user_data;`
`195`	`195`	`new_job->cancellable = cancellable;`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ static void`
`92`	`92`	`search_helper_free (SearchHelper *helper)`
`93`	`93`	`{`
`94`	`94`	`g_free (helper->exec_format);`
`95`		`- g_slice_free (SearchHelper, helper);`
	`95`	`+ g_free (helper);`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`static GList *`
`@@ -220,7 +220,7 @@ process_search_helper_file (const gchar *path)`
`220`	`220`	`DEBUG ("Replacing existing nemo search_helper for '%s' with %s based on priority.", mime_type, path);`
`221`	`221`	`}`
`222`	`222`
`223`		`- helper = g_slice_new0 (SearchHelper);`
	`223`	`+ helper = g_new0 (SearchHelper, 1);`
`224`	`224`	`helper->exec_format = g_strdup (exec_format);`
`225`	`225`	`helper->priority = priority;`
`226`	`226`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ static GHashTable *fsr_accounting_table = NULL;`
`180`	`180`	`FileSearchResult *`
`181`	`181`	`file_search_result_new (gchar uri, gchar snippet)`
`182`	`182`	`{`
`183`		`- FileSearchResult *ret = g_slice_new0 (FileSearchResult);`
	`183`	`+ FileSearchResult *ret = g_new0 (FileSearchResult, 1);`
`184`	`184`
`185`	`185`	`ret->uri = uri;`
`186`	`186`	`ret->snippet = snippet;`
`@@ -215,7 +215,7 @@ file_search_result_free (FileSearchResult *res)`
`215`	`215`
`216`	`216`	`g_free (res->uri);`
`217`	`217`	`g_free (res->snippet);`
`218`		`- g_slice_free (FileSearchResult, res);`
	`218`	`+ g_free (res);`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`void`