summaryrefslogtreecommitdiff
path: root/libgjs-private
diff options
context:
space:
mode:
authorPhilip Chimento <philip.chimento@gmail.com>2020-12-04 16:07:02 -0800
committerPhilip Chimento <philip.chimento@gmail.com>2020-12-04 16:12:02 -0800
commit1dd64f410b0ee73116a8b4a8bf3124e63d6fdbd8 (patch)
treec407c90dd9bc71b2f9810bb60ada02d2caa64fc8 /libgjs-private
parentfd162a4a8fe800755b44c6af4f2d56fbf0269908 (diff)
downloadgjs-1dd64f410b0ee73116a8b4a8bf3124e63d6fdbd8.tar.gz
build: Require gobject-introspection 1.66.0
1.66.0 is now required both for building GJS and for running the test suite. Remove all the existing workarounds for bugs that were fixed in versions prior to 1.66.0.
Diffstat (limited to 'libgjs-private')
-rw-r--r--libgjs-private/gjs-util.c26
1 files changed, 0 insertions, 26 deletions
diff --git a/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c
index 30b6e8fc..6599567d 100644
--- a/libgjs-private/gjs-util.c
+++ b/libgjs-private/gjs-util.c
@@ -8,7 +8,6 @@
#include <locale.h> /* for setlocale */
#include <stddef.h> /* for size_t */
-#include <string.h> /* for strcmp */
#include <gio/gio.h>
#include <glib-object.h>
@@ -190,24 +189,6 @@ int gjs_open_bytes(GBytes* bytes, GError** error) {
#endif
}
-static GIBaseInfo* find_method_fallback(GIStructInfo* class_info,
- const char* method_name) {
- GIBaseInfo* method;
- guint n_methods, i;
-
- n_methods = g_struct_info_get_n_methods(class_info);
-
- for (i = 0; i < n_methods; i++) {
- method = g_struct_info_get_method(class_info, i);
-
- if (strcmp(g_base_info_get_name(method), method_name) == 0)
- return method;
- g_base_info_unref(method);
- }
-
- return NULL;
-}
-
static GParamSpec* gjs_gtk_container_class_find_child_property(
GIObjectInfo* container_info, GObject* container, const char* property) {
GIBaseInfo* class_info = NULL;
@@ -220,13 +201,6 @@ static GParamSpec* gjs_gtk_container_class_find_child_property(
find_child_property_fun =
g_struct_info_find_method(class_info, "find_child_property");
- /* Workaround for
- https://gitlab.gnome.org/GNOME/gobject-introspection/merge_requests/171
- */
- if (find_child_property_fun == NULL)
- find_child_property_fun =
- find_method_fallback(class_info, "find_child_property");
-
find_child_property_args[0].v_pointer = G_OBJECT_GET_CLASS(container);
find_child_property_args[1].v_string = (char*)property;