Indicator Applet

Merge lp:~indicator-applet-developers/indicator-applet/ubuntu into lp:~ubuntu-desktop/indicator-applet/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: 284
Proposed branch: lp:~indicator-applet-developers/indicator-applet/ubuntu
Merge into: lp:~ubuntu-desktop/indicator-applet/ubuntu
Diff against target: 196 lines (+82/-5) (has conflicts)
7 files modified
AUTHORS (+1/-0)
ChangeLog (+28/-0)
configure (+2/-2)
configure.ac (+2/-2)
debian/changelog (+12/-0)
debian/control (+1/-1)
src/applet-main.c (+36/-0)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~indicator-applet-developers/indicator-applet/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+50229@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'AUTHORS'
2--- AUTHORS 2011-01-27 21:46:43 +0000
3+++ AUTHORS 2011-02-17 21:01:54 +0000
4@@ -4,6 +4,7 @@
5 Cody Russell
6 Eitan Isaacson
7 Kevin Turner
8+ Luke Yelavich
9 Marco Trevisan (Treviño)
10 MarkieB
11 Martin Pitt
12
13=== modified file 'ChangeLog'
14--- ChangeLog 2011-02-03 20:32:48 +0000
15+++ ChangeLog 2011-02-17 21:01:54 +0000
16@@ -1,5 +1,33 @@
17 # Generated by Makefile. Do not edit.
18
19+2011-02-17 Ted Gould <ted@gould.cx>
20+
21+ 0.4.9
22+
23+2011-02-17 Ted Gould <ted@gould.cx>
24+
25+ Adding support for accessible descriptions
26+
27+2011-02-17 Ted Gould <ted@gould.cx>
28+
29+ libindicator v. 0.3.19
30+
31+2011-02-17 Ted Gould <ted@gould.cx>
32+
33+ Check to ensure the accessible object isn't NULL
34+
35+2011-02-17 Ted Gould <ted@gould.cx>
36+
37+ It should be the indicator's responsibility to update the value in the entry, not ours.
38+
39+2011-02-16 Luke Yelavich <luke.yelavich@canonical.com>
40+
41+ menuitem is already a GtkWidget
42+
43+2011-02-14 Luke Yelavich <luke.yelavich@canonical.com>
44+
45+ Add accessible_desc support
46+
47 2011-02-03 Ted Gould <ted@gould.cx>
48
49 0.4.8
50
51=== modified file 'configure'
52--- configure 2011-02-03 20:32:48 +0000
53+++ configure 2011-02-17 21:01:54 +0000
54@@ -2846,7 +2846,7 @@
55
56 # Define the identity of the package.
57 PACKAGE=indicator-applet
58- VERSION=0.4.8
59+ VERSION=0.4.9
60
61
62 cat >>confdefs.h <<_ACEOF
63@@ -11954,7 +11954,7 @@
64 ###########################
65
66 GTK_REQUIRED_VERSION=2.12
67-INDICATOR_REQUIRED_VERSION=0.3.18
68+INDICATOR_REQUIRED_VERSION=0.3.19
69
70
71
72
73=== modified file 'configure.ac'
74--- configure.ac 2011-02-03 20:32:48 +0000
75+++ configure.ac 2011-02-17 21:01:54 +0000
76@@ -4,7 +4,7 @@
77 AC_PREREQ(2.53)
78
79 AM_CONFIG_HEADER(config.h)
80-AM_INIT_AUTOMAKE(indicator-applet, 0.4.8)
81+AM_INIT_AUTOMAKE(indicator-applet, 0.4.9)
82
83 AM_MAINTAINER_MODE
84 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
85@@ -26,7 +26,7 @@
86 ###########################
87
88 GTK_REQUIRED_VERSION=2.12
89-INDICATOR_REQUIRED_VERSION=0.3.18
90+INDICATOR_REQUIRED_VERSION=0.3.19
91
92 PKG_CHECK_MODULES(APPLET, gtk+-2.0 >= $GTK_REQUIRED_VERSION
93 x11
94
95=== modified file 'debian/changelog'
96--- debian/changelog 2011-02-03 20:53:11 +0000
97+++ debian/changelog 2011-02-17 21:01:54 +0000
98@@ -1,4 +1,16 @@
99+<<<<<<< TREE
100 indicator-applet (0.4.8-0ubuntu1) natty; urgency=low
101+=======
102+indicator-applet (0.4.9-0ubuntu1~ppa1) natty; urgency=low
103+
104+ * New upstream release.
105+ * Support for accessible descriptions
106+ * debian/control: libindicator dep bump to 0.3.19
107+
108+ -- Ted Gould <ted@ubuntu.com> Thu, 17 Feb 2011 14:56:51 -0600
109+
110+indicator-applet (0.4.8-0ubuntu1~ppa1) natty; urgency=low
111+>>>>>>> MERGE-SOURCE
112
113 * New upstream release.
114 * Close menus when asked nicely.
115
116=== modified file 'debian/control'
117--- debian/control 2011-01-27 21:50:59 +0000
118+++ debian/control 2011-02-17 21:01:54 +0000
119@@ -12,7 +12,7 @@
120 intltool,
121 libxml2-dev,
122 gtk-doc-tools,
123- libindicator-dev (>= 0.3.18),
124+ libindicator-dev (>= 0.3.19),
125 dh-autoreconf,
126 libx11-dev
127 Standards-Version: 3.9.1
128
129=== modified file 'src/applet-main.c'
130--- src/applet-main.c 2011-02-03 20:32:48 +0000
131+++ src/applet-main.c 2011-02-17 21:01:54 +0000
132@@ -55,6 +55,7 @@
133 GdkColor *colour,
134 GdkPixmap *pixmap,
135 GtkWidget *menubar);
136+static void update_accessible_desc (IndicatorObjectEntry * entry, GtkWidget * menuitem);
137
138 /*************
139 * main
140@@ -243,6 +244,14 @@
141 }
142
143 static void
144+accessible_desc_update (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menuitem)
145+{
146+ g_return_if_fail(GTK_IS_WIDGET(menuitem));
147+ update_accessible_desc(entry, menuitem);
148+ return;
149+}
150+
151+static void
152 entry_added (IndicatorObject * io, IndicatorObjectEntry * entry, GtkWidget * menubar)
153 {
154 g_debug("Signal: Entry Added");
155@@ -319,7 +328,12 @@
156
157 gtk_menu_shell_insert(GTK_MENU_SHELL(menubar), menuitem, position.menupos);
158
159+ g_signal_connect(G_OBJECT(io), INDICATOR_OBJECT_SIGNAL_ACCESSIBLE_DESC_UPDATE, G_CALLBACK(accessible_desc_update), menuitem);
160+
161 if (something_visible) {
162+ if (entry->accessible_desc != NULL) {
163+ update_accessible_desc(entry, menuitem);
164+ }
165 gtk_widget_show(menuitem);
166 }
167 gtk_widget_set_sensitive(menuitem, something_sensitive);
168@@ -443,6 +457,28 @@
169 // TODO: do something sensible here
170 }
171
172+static void
173+update_accessible_desc(IndicatorObjectEntry * entry, GtkWidget * menuitem)
174+{
175+ /* FIXME: We need to deal with the use case where the contents of the
176+ label overrides what is found in the atk object's name, or at least
177+ orca speaks the label instead of the atk object name.
178+ */
179+ AtkObject * menuitem_obj = gtk_widget_get_accessible(menuitem);
180+ if (menuitem_obj == NULL) {
181+ /* Should there be an error printed here? */
182+ return;
183+ }
184+
185+ if (entry->accessible_desc != NULL) {
186+ atk_object_set_name(menuitem_obj, entry->accessible_desc);
187+ } else {
188+ atk_object_set_name(menuitem_obj, "");
189+ }
190+ return;
191+}
192+
193+
194 static gboolean
195 load_module (const gchar * name, GtkWidget * menubar)
196 {

Subscribers

People subscribed via source and target branches