luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-02 07:23:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

UnixMountEntry: Deprecate g_unix_mount_* API in favor of g_unix_mount_entry_*

Browse Source 
This issue arises because the g_unix_mount_* naming convention does not match
the GUnixMountEntry instance type, confusing the introspection generator.

To resolve this, we are deprecating the g_unix_mount_* API functions that take
a GUnixMountEntry parameter and introducing equivalent g_unix_mount_entry_*
functions that correctly associate with the GUnixMountEntry instance. This change
ensures that introspection data correctly treats these as instance methods and
that documentation reflects proper ownership of returned data.

(Some minor tweaks by Philip Withnall.)

Fixes: #3492
This commit is contained in:
Jialu Zhou
2024-10-18 10:31:12 +01:00
committed by Philip Withnall
parent eb413097e5
commit aac56f1618
10 changed files with 608 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
gio/tests/trash.c
View File

@@ -66,10 +66,10 @@ test_trash_not_supported (void)
return;
}
mount = g_unix_mount_for (g_file_peek_path (file), NULL);
g_assert_true (mount == NULL || g_unix_mount_is_system_internal (mount));
g_test_message ("Mount: %s", (mount != NULL) ? g_unix_mount_get_mount_path (mount) : "(null)");
g_clear_pointer (&mount, g_unix_mount_free);
mount = g_unix_mount_entry_for (g_file_peek_path (file), NULL);
g_assert_true (mount == NULL || g_unix_mount_entry_is_system_internal (mount));
g_test_message ("Mount: %s", (mount != NULL) ? g_unix_mount_entry_get_mount_path (mount) : "(null)");
g_clear_pointer (&mount, g_unix_mount_entry_free);
/* g_file_trash() shouldn't be supported on system internal mounts,
* because those are not monitored by gvfsd-trash.
@@ -119,7 +119,7 @@ test_trash_symlinks (void)
return;
}
target_mount = g_unix_mount_for (target, NULL);
target_mount = g_unix_mount_entry_for (target, NULL);
if (target_mount == NULL)
{
@@ -129,32 +129,32 @@ test_trash_symlinks (void)
}
g_assert_nonnull (target_mount);
g_test_message ("Target: %s (mount: %s)", target, g_unix_mount_get_mount_path (target_mount));
g_test_message ("Target: %s (mount: %s)", target, g_unix_mount_entry_get_mount_path (target_mount));
tmp = g_dir_make_tmp ("test-trashXXXXXX", &error);
g_assert_no_error (error);
g_assert_nonnull (tmp);
tmp_mount = g_unix_mount_for (tmp, NULL);
tmp_mount = g_unix_mount_entry_for (tmp, NULL);
if (tmp_mount == NULL)
{
g_test_skip_printf ("Unable to determine mount point for %s", tmp);
g_unix_mount_free (target_mount);
g_unix_mount_entry_free (target_mount);
g_free (target);
g_free (tmp);
return;
}
g_assert_nonnull (tmp_mount);
g_test_message ("Tmp: %s (mount: %s)", tmp, g_unix_mount_get_mount_path (tmp_mount));
g_test_message ("Tmp: %s (mount: %s)", tmp, g_unix_mount_entry_get_mount_path (tmp_mount));
if (g_unix_mount_compare (target_mount, tmp_mount) == 0)
if (g_unix_mount_entry_compare (target_mount, tmp_mount) == 0)
{
g_test_skip ("The tmp has to be on another mount than the home to run this test");
g_unix_mount_free (tmp_mount);
g_unix_mount_entry_free (tmp_mount);
g_free (tmp);
g_unix_mount_free (target_mount);
g_unix_mount_entry_free (target_mount);
g_free (target);
return;
@@ -164,28 +164,28 @@ test_trash_symlinks (void)
g_file_make_symbolic_link (symlink, g_get_home_dir (), NULL, &error);
g_assert_no_error (error);
symlink_mount = g_unix_mount_for (g_file_peek_path (symlink), NULL);
symlink_mount = g_unix_mount_entry_for (g_file_peek_path (symlink), NULL);
g_assert_nonnull (symlink_mount);
g_test_message ("Symlink: %s (mount: %s)", g_file_peek_path (symlink), g_unix_mount_get_mount_path (symlink_mount));
g_test_message ("Symlink: %s (mount: %s)", g_file_peek_path (symlink), g_unix_mount_entry_get_mount_path (symlink_mount));
g_assert_cmpint (g_unix_mount_compare (symlink_mount, tmp_mount), ==, 0);
g_assert_cmpint (g_unix_mount_entry_compare (symlink_mount, tmp_mount), ==, 0);
target_over_symlink = g_build_filename (g_file_peek_path (symlink),
".local",
NULL);
target_over_symlink_mount = g_unix_mount_for (target_over_symlink, NULL);
target_over_symlink_mount = g_unix_mount_entry_for (target_over_symlink, NULL);
g_assert_nonnull (symlink_mount);
g_test_message ("Target over symlink: %s (mount: %s)", target_over_symlink, g_unix_mount_get_mount_path (target_over_symlink_mount));
g_test_message ("Target over symlink: %s (mount: %s)", target_over_symlink, g_unix_mount_entry_get_mount_path (target_over_symlink_mount));
g_assert_cmpint (g_unix_mount_compare (target_over_symlink_mount, target_mount), ==, 0);
g_assert_cmpint (g_unix_mount_entry_compare (target_over_symlink_mount, target_mount), ==, 0);
g_unix_mount_free (target_over_symlink_mount);
g_unix_mount_free (symlink_mount);
g_unix_mount_entry_free (target_over_symlink_mount);
g_unix_mount_entry_free (symlink_mount);
g_free (target_over_symlink);
g_object_unref (symlink);
g_unix_mount_free (tmp_mount);
g_unix_mount_entry_free (tmp_mount);
g_free (tmp);
g_unix_mount_free (target_mount);
g_unix_mount_entry_free (target_mount);
g_free (target);
}