luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-15 04:05:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'girepository-fixes' into 'main'

Browse Source 
Various girepository fixes

See merge request GNOME/glib!3877
This commit is contained in:
Philip Withnall 2024-02-05 10:01:20 +00:00
commit 7ff207b1cf
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
girepository/giregisteredtypeinfo.h
View File

@ -58,7 +58,7 @@ G_BEGIN_DECLS
* *
* Since: 2.80 * Since: 2.80
*/ */
#define GI_IS_REGISTERED_TYPE_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_OBJECT_INFO)) #define GI_IS_REGISTERED_TYPE_INFO(info) (G_TYPE_CHECK_INSTANCE_TYPE ((info), GI_TYPE_REGISTERED_TYPE_INFO))
GI_AVAILABLE_IN_ALL GI_AVAILABLE_IN_ALL
const char * gi_registered_type_info_get_type_name (GIRegisteredTypeInfo *info); const char * gi_registered_type_info_get_type_name (GIRegisteredTypeInfo *info);

2
girepository/girepository.c
View File

@ -1653,6 +1653,8 @@ gi_repository_enumerate_versions (GIRepository *repository,
const char *loaded_version; const char *loaded_version;
char **ret; char **ret;
g_return_val_if_fail (GI_IS_REPOSITORY (repository), NULL);
candidates = enumerate_namespace_versions (namespace_, candidates = enumerate_namespace_versions (namespace_,
(const char * const *) repository->typelib_search_path->pdata, (const char * const *) repository->typelib_search_path->pdata,
repository->typelib_search_path->len); repository->typelib_search_path->len);

10
girepository/tests/repository.c
View File

@ -90,6 +90,9 @@ test_repository_info (RepositoryFixture *fx,
object_info = GI_OBJECT_INFO (gi_repository_find_by_name (fx->repository, "GObject", "Object")); object_info = GI_OBJECT_INFO (gi_repository_find_by_name (fx->repository, "GObject", "Object"));
g_assert_nonnull (object_info); g_assert_nonnull (object_info);
g_assert_true (GI_IS_OBJECT_INFO (object_info));
g_assert_true (GI_IS_REGISTERED_TYPE_INFO (object_info));
g_assert_true (GI_IS_BASE_INFO (object_info));
g_assert_cmpint (gi_base_info_get_info_type (GI_BASE_INFO (object_info)), ==, GI_INFO_TYPE_OBJECT); g_assert_cmpint (gi_base_info_get_info_type (GI_BASE_INFO (object_info)), ==, GI_INFO_TYPE_OBJECT);
g_assert_cmpstr (gi_base_info_get_name (GI_BASE_INFO (object_info)), ==, "Object"); g_assert_cmpstr (gi_base_info_get_name (GI_BASE_INFO (object_info)), ==, "Object");
@ -103,6 +106,9 @@ test_repository_info (RepositoryFixture *fx,
signal_info = gi_object_info_find_signal (object_info, "notify"); signal_info = gi_object_info_find_signal (object_info, "notify");
g_assert_nonnull (signal_info); g_assert_nonnull (signal_info);
g_assert_true (GI_IS_SIGNAL_INFO (signal_info));
g_assert_true (GI_IS_CALLABLE_INFO (signal_info));
g_assert_true (GI_IS_BASE_INFO (signal_info));
g_assert_cmpint (gi_signal_info_get_flags (signal_info), ==, g_assert_cmpint (gi_signal_info_get_flags (signal_info), ==,
G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS | G_SIGNAL_ACTION); G_SIGNAL_RUN_FIRST | G_SIGNAL_NO_RECURSE | G_SIGNAL_DETAILED | G_SIGNAL_NO_HOOKS | G_SIGNAL_ACTION);
@ -111,6 +117,10 @@ test_repository_info (RepositoryFixture *fx,
method_info = gi_object_info_find_method (object_info, "get_property"); method_info = gi_object_info_find_method (object_info, "get_property");
g_assert_nonnull (method_info); g_assert_nonnull (method_info);
g_assert_true (GI_IS_FUNCTION_INFO (method_info));
g_assert_true (GI_IS_CALLABLE_INFO (method_info));
g_assert_true (GI_IS_BASE_INFO (method_info));
g_assert_true (gi_callable_info_is_method (GI_CALLABLE_INFO (method_info))); g_assert_true (gi_callable_info_is_method (GI_CALLABLE_INFO (method_info)));
g_assert_cmpuint (gi_callable_info_get_n_args (GI_CALLABLE_INFO (method_info)), ==, 2); g_assert_cmpuint (gi_callable_info_get_n_args (GI_CALLABLE_INFO (method_info)), ==, 2);
g_clear_pointer (&method_info, gi_base_info_unref); g_clear_pointer (&method_info, gi_base_info_unref);