[gjs] arg-cache: Fix rebase collision
- From: Philip Chimento <pchimento src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gjs] arg-cache: Fix rebase collision
- Date: Tue, 4 May 2021 05:05:58 +0000 (UTC)
commit 7b1eb175f8731a5d5f56156bc486d400e427bfc9
Author: Philip Chimento <philip chimento gmail com>
Date: Mon May 3 22:05:49 2021 -0700
arg-cache: Fix rebase collision
This was a more recent change than the branch that was just merged.
Unreviewed, pushing to fix build.
gi/arg-cache.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gi/arg-cache.cpp b/gi/arg-cache.cpp
index 8889e798..6fb1e1f0 100644
--- a/gi/arg-cache.cpp
+++ b/gi/arg-cache.cpp
@@ -1399,7 +1399,7 @@ static void gjs_arg_cache_build_interface_in_arg(GjsArgumentCache* self,
!g_struct_info_is_gtype_struct(interface_info)) {
// This covers cases such as GTypeInstance
self->marshallers = &fallback_in_marshallers;
- return true;
+ return;
}
self->contents.object.gtype = gtype;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]