From 706107e5892a1bd65f050d89c6b364b58f836061 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Thu, 19 Jun 2014 17:27:51 +0200 Subject: [PATCH] Do not overwrite text attributes with the default ones As it was implemented, the default attributes are appended to the end of the list, and later in time only the last occurence of every attribute will be preserved. Just changing the order of the list fixes this bug. https://bugzilla.gnome.org/show_bug.cgi?id=731980 --- atk-adaptor/adaptors/text-adaptor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/atk-adaptor/adaptors/text-adaptor.c b/atk-adaptor/adaptors/text-adaptor.c index be10349..e80daf8 100644 --- a/atk-adaptor/adaptors/text-adaptor.c +++ b/atk-adaptor/adaptors/text-adaptor.c @@ -799,16 +799,17 @@ impl_GetAttributeRun (DBusConnection * bus, DBusMessage * message, return droute_invalid_arguments_error (message); } - attributes = - atk_text_get_run_attributes (text, offset, &intstart_offset, - &intend_offset); - if (includeDefaults) { attributes = g_slist_concat (attributes, atk_text_get_default_attributes (text)); } + attributes = g_slist_concat (attributes, + atk_text_get_run_attributes (text, offset, + &intstart_offset, + &intend_offset)); + reply = dbus_message_new_method_return (message); if (!reply) return NULL; -- 2.34.1