← Back to branch summary

~mial/ubuntu/oneiric/unity/bug-791810

« back to all changes in this revision

Viewing changes to services/panel-indicator-entry-accessible.c

  • Committer: Rodrigo Moya
  • Date: 2011-03-15 10:57:34 UTC
  • mfrom: (949 trunk)
  • mto: This revision was merged to the branch mainline in revision 965.
  • Revision ID: rodrigo.moya@canonical.com-20110315105734-9z1bui3v4rvb6vt9
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
services/panel-indicator-entry-accessible.c
229
229
    {
230
230
      atk_object_set_role (accessible, ATK_ROLE_LABEL);
231
231
      atk_object_set_name (accessible,
232
 
                           piea->priv->entry->accessible_desc ? 
233
 
                           piea->priv->entry->accessible_desc :
234
232
                           gtk_label_get_text (piea->priv->entry->label));
235
233
    }
236
234
  if (GTK_IS_IMAGE (piea->priv->entry->image))
238
236
      atk_object_set_role (accessible, ATK_ROLE_IMAGE);
239
237
      if (piea->priv->entry->accessible_desc != NULL)
240
238
        {
241
 
          atk_object_set_name (accessible, piea->priv->entry->accessible_desc);
 
239
          atk_object_set_name (accessible, atk_object_get_name (ATK_OBJECT (piea->priv->entry->image)));
242
240
        }
243
241
    }
 
242
 
 
243
  atk_object_set_description (accessible, piea->priv->entry->accessible_desc);
244
244
}
245
245
 
246
246
static gint
268
268
 
269
269
  piea = PANEL_INDICATOR_ENTRY_ACCESSIBLE (accessible);
270
270
  if (GTK_IS_MENU (piea->priv->entry->menu))
271
 
    child = gtk_widget_get_accessible (GTK_WIDGET (piea->priv->entry->menu));
 
271
    {
 
272
      child = gtk_widget_get_accessible (GTK_WIDGET (piea->priv->entry->menu));
 
273
      atk_object_set_parent (child, accessible);
 
274
    }
272
275
 
273
276
  return child;
274
277
}