From 12aee91b2a37ba65ff4d7edfc6936b3c27e3cb73 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Tue, 7 Feb 2017 17:00:36 +0100 Subject: Don't spam accessible name changes when it is translated Fix the logic guarding against updating the name and description so that it properly checks against strings in the same locale. This prevents spamming accessibility 'accessible-name' change events, avoiding some noise when interacting with the panel. --- mate-panel/panel-toplevel.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mate-panel') diff --git a/mate-panel/panel-toplevel.c b/mate-panel/panel-toplevel.c index 5fa785b3..34cc241d 100644 --- a/mate-panel/panel-toplevel.c +++ b/mate-panel/panel-toplevel.c @@ -1646,7 +1646,7 @@ static const char* panel_toplevel_construct_description(PanelToplevel *toplevel) }; if (toplevel->priv->attached) - return N_("Drawer"); + return _("Drawer"); switch (toplevel->priv->orientation) { case PANEL_ORIENTATION_TOP: @@ -1677,7 +1677,7 @@ static const char* panel_toplevel_construct_description(PanelToplevel *toplevel) else type = 3; - return description[orientation][type]; + return _(description[orientation][type]); } static void panel_toplevel_update_description(PanelToplevel* toplevel) @@ -1692,7 +1692,7 @@ static void panel_toplevel_update_description(PanelToplevel* toplevel) if (toplevel->priv->description) g_free (toplevel->priv->description); - toplevel->priv->description = g_strdup (_(description)); + toplevel->priv->description = g_strdup (description); if (!toplevel->priv->name) gtk_window_set_title (GTK_WINDOW (toplevel), @@ -1701,8 +1701,8 @@ static void panel_toplevel_update_description(PanelToplevel* toplevel) panel_a11y_set_atk_name_desc ( GTK_WIDGET (toplevel->priv->panel_widget), toplevel->priv->name ? toplevel->priv->name : - _(toplevel->priv->description), - _(toplevel->priv->description)); + toplevel->priv->description, + toplevel->priv->description); } static void panel_toplevel_update_attached_position(PanelToplevel* toplevel, gboolean hidden, int* x, int* y, int* w, int* h) -- cgit v1.2.1