blob: 2e1dcbdf9bd65bce067600c59b3b2be29f45f205 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
|
From 1a4f274b071a1486204470392d2427069533f8ca Mon Sep 17 00:00:00 2001
From: Joel Winarske <joel.winarske@gmail.com>
Date: Thu, 8 Sep 2022 16:15:06 -0700
Subject: [PATCH] prevent redefinition of glib_autoptr_clear_AtkObject
Signed-off-by: Joel Winarske <joel.winarske@gmail.com>
---
flutter/shell/platform/linux/fl_accessible_node.h | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/flutter/shell/platform/linux/fl_accessible_node.h b/flutter/shell/platform/linux/fl_accessible_node.h
index ff38ad49c6..190cb982a1 100644
--- a/flutter/shell/platform/linux/fl_accessible_node.h
+++ b/flutter/shell/platform/linux/fl_accessible_node.h
@@ -5,17 +5,14 @@
#ifndef FLUTTER_SHELL_PLATFORM_LINUX_FL_ACCESSIBLE_NODE_H_
#define FLUTTER_SHELL_PLATFORM_LINUX_FL_ACCESSIBLE_NODE_H_
-#include <gtk/gtk.h>
+#include <gio/gio.h>
+#include <atk/atk.h>
#include "flutter/shell/platform/embedder/embedder.h"
#include "flutter/shell/platform/linux/public/flutter_linux/fl_engine.h"
G_BEGIN_DECLS
-// ATK doesn't have the g_autoptr macros, so add them manually.
-// https://gitlab.gnome.org/GNOME/atk/-/issues/10
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(AtkObject, g_object_unref)
-
#define FL_TYPE_ACCESSIBLE_NODE fl_accessible_node_get_type()
G_DECLARE_DERIVABLE_TYPE(FlAccessibleNode,
fl_accessible_node,
--
2.34.3
|
