message-area: set a11y object name from actual icon name

monsta · raveit65 · commit fde24d00e6c3 · 2019-01-21T14:23:51.000+01:00
diff --git a/shell/ev-message-area.c b/shell/ev-message-area.c
@@ -140,7 +140,6 @@ ev_message_area_set_image_for_type (EvMessageArea *area,
 				    GtkMessageType type)
 {
 	const gchar *icon_name = NULL;
-	const gchar *stock_id = NULL;
 	AtkObject   *atk_obj;
 
 	switch (type) {
@@ -170,10 +169,8 @@ ev_message_area_set_image_for_type (EvMessageArea *area,
 	atk_obj = gtk_widget_get_accessible (GTK_WIDGET (area));
 	if (GTK_IS_ACCESSIBLE (atk_obj)) {
 		atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
-		if (stock_id) {
-			GtkStockItem item;
-			gtk_stock_lookup (stock_id, &item);
-			atk_object_set_name (atk_obj, item.label);
+		if (icon_name) {
+			atk_object_set_name (atk_obj, icon_name);
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,6 @@ ev_message_area_set_image_for_type (EvMessageArea *area,`
`140`	`140`	`GtkMessageType type)`
`141`	`141`	`{`
`142`	`142`	`const gchar *icon_name = NULL;`
`143`		`- const gchar *stock_id = NULL;`
`144`	`143`	`AtkObject *atk_obj;`
`145`	`144`
`146`	`145`	`switch (type) {`
`@@ -170,10 +169,8 @@ ev_message_area_set_image_for_type (EvMessageArea *area,`
`170`	`169`	`atk_obj = gtk_widget_get_accessible (GTK_WIDGET (area));`
`171`	`170`	`if (GTK_IS_ACCESSIBLE (atk_obj)) {`
`172`	`171`	`atk_object_set_role (atk_obj, ATK_ROLE_ALERT);`
`173`		`- if (stock_id) {`
`174`		`- GtkStockItem item;`
`175`		`- gtk_stock_lookup (stock_id, &item);`
`176`		`- atk_object_set_name (atk_obj, item.label);`
	`172`	`+ if (icon_name) {`
	`173`	`+ atk_object_set_name (atk_obj, icon_name);`
`177`	`174`	`}`
`178`	`175`	`}`
`179`	`176`	`}`