Merge lp:~rodrigo-moya/ubuntu/natty/gnome-control-center/fix-740729 into lp:~ubuntu-desktop/gnome-control-center/ubuntu

[Rodrigo Moya]

=== modified file 'debian/changelog'
--- debian/changelog	2011-04-05 13:55:56 +0000
+++ debian/changelog	2011-04-11 15:28:32 +0000
@@ -1,3 +1,10 @@
+gnome-control-center (1:2.32.1-0ubuntu14) UNRELEASED; urgency=low
+
+  * debian/patches/06_use_icon_description_in_indicator.patch:
+    - Add patch to set a description (for A11Y) on indicators (LP: #740729)
+
+ -- Rodrigo Moya <[e-mail]>  Mon, 11 Apr 2011 16:59:07 +0200
+
 gnome-control-center (1:2.32.1-0ubuntu13) natty; urgency=low
 
   * remove 112_banshee_in_media_dropdown.patch now that banshee executable

=== added file 'debian/patches/06_use_icon_description_in_indicator.patch'
--- debian/patches/06_use_icon_description_in_indicator.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/06_use_icon_description_in_indicator.patch	2011-04-11 15:28:32 +0000
@@ -0,0 +1,13 @@
+diff --git a/typing-break/drwright.c b/typing-break/drwright.c
+index 5e8674d..c7fc026 100644
+--- a/typing-break/drwright.c
++++ b/typing-break/drwright.c
+@@ -521,6 +521,8 @@ update_status (DrWright *dr)
+ #ifdef HAVE_APP_INDICATOR
+ 	item = gtk_ui_manager_get_widget (dr->ui_manager, "/Pop/TakeABreak");
+ 	gtk_menu_item_set_label (GTK_MENU_ITEM (item), str);
++	app_indicator_set_attention_icon_full (dr->indicator, TYPING_MONITOR_ATTENTION_ICON, str);
++	app_indicator_set_icon_full (dr->indicator, TYPING_MONITOR_ACTIVE_ICON, str);
+ #else
+ 	gtk_status_icon_set_tooltip_text (dr->icon, str);
+ #endif /* HAVE_APP_INDICATOR */

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-04-05 13:55:43 +0000
+++ debian/patches/series	2011-04-11 15:28:32 +0000
@@ -3,6 +3,7 @@
 01_remove_debian_default_applications.patch
 03_use_libunique.patch
 04_keyboard_layout_gconf_names.patch
+06_use_icon_description_in_indicator.patch
 100_at_properties_readd_gksudo_disable_grab_toggle.patch
 113_at_properties_add_visual_bell.patch
 16_preferred_applications_list_cleanup.patch