From dc0dc3318171c824ba16cbb3e28780df2bda21cc Mon Sep 17 00:00:00 2001 From: Mike Gorse Date: Thu, 7 Apr 2022 14:48:00 -0500 Subject: Fix GetActions The previous code created a (sss) structure and tried to insert four strings. Ideally, the action's unlocalized name would be sent in the structure. But this would require changing the xml specification, which would break gtk 4's implementation. For now, do what gtk 4 does and send the localized name, description, and keybinding for each action. Helps #20 --- atk-adaptor/adaptors/action-adaptor.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/atk-adaptor/adaptors/action-adaptor.c b/atk-adaptor/adaptors/action-adaptor.c index 784d136..ab80590 100644 --- a/atk-adaptor/adaptors/action-adaptor.c +++ b/atk-adaptor/adaptors/action-adaptor.c @@ -170,12 +170,9 @@ impl_GetActions (DBusConnection * bus, DBusMessage * message, void *user_data) goto oom; for (i = 0; i < count; i++) { - const char *name = atk_action_get_name (action, i); const char *lname = atk_action_get_localized_name (action, i); const char *desc = atk_action_get_description (action, i); const char *kb = atk_action_get_keybinding (action, i); - if (!name) - name = ""; if (!lname) lname = ""; if (!desc) @@ -185,7 +182,6 @@ impl_GetActions (DBusConnection * bus, DBusMessage * message, void *user_data) if (!dbus_message_iter_open_container (&iter_array, DBUS_TYPE_STRUCT, NULL, &iter_struct)) goto oom; - dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &name); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &lname); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &desc); dbus_message_iter_append_basic (&iter_struct, DBUS_TYPE_STRING, &kb); -- cgit v1.2.1