Merge lp:~themuso/network-manager-applet/set-atk-label-relations into lp:~network-manager/network-manager-applet/ubuntu
- set-atk-label-relations
- Merge into ubuntu
Proposed by
Luke Yelavich
Status: | Merged |
---|---|
Merged at revision: | 433 |
Proposed branch: | lp:~themuso/network-manager-applet/set-atk-label-relations |
Merge into: | lp:~network-manager/network-manager-applet/ubuntu |
Diff against target: |
430 lines (+410/-0) 3 files modified
debian/changelog (+7/-0) debian/patches/series (+1/-0) debian/patches/set_atk_relations.patch (+402/-0) |
To merge this branch: | bzr merge lp:~themuso/network-manager-applet/set-atk-label-relations |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Network-manager | Pending | ||
Review via email: mp+205514@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Marius B. Kotsbak (mariusko) wrote : | # |
Revision history for this message
Luke Yelavich (themuso) wrote : | # |
On Mon, Feb 10, 2014 at 09:18:39PM EST, Marius B. Kotsbak wrote:
> Has this patch been sent upstream?
Not as yet, as I need to port it to the latest upstream code, given git master uses GTK grid, and not GTK table.
- 430. By Luke Yelavich
-
Merge with trunk.
Revision history for this message
Luke Yelavich (themuso) wrote : | # |
This is now submitted upstrea: https:/
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2014-03-05 19:16:49 +0000 | |||
3 | +++ debian/changelog 2014-03-10 06:10:45 +0000 | |||
4 | @@ -1,3 +1,10 @@ | |||
5 | 1 | network-manager-applet (0.9.8.8-0ubuntu2) UNRELEASED; urgency=medium | ||
6 | 2 | |||
7 | 3 | * debian/patches/set_atk_relations.patch: Set label relationships in info | ||
8 | 4 | dialogs to better present information to Orca users. (LP: #1266302) | ||
9 | 5 | |||
10 | 6 | -- Luke Yelavich <themuso@ubuntu.com> Mon, 10 Mar 2014 16:57:08 +1100 | ||
11 | 7 | |||
12 | 1 | network-manager-applet (0.9.8.8-0ubuntu1) trusty; urgency=medium | 8 | network-manager-applet (0.9.8.8-0ubuntu1) trusty; urgency=medium |
13 | 2 | 9 | ||
14 | 3 | * New upstream release. (LP: #1276082) | 10 | * New upstream release. (LP: #1276082) |
15 | 4 | 11 | ||
16 | === modified file 'debian/patches/series' | |||
17 | --- debian/patches/series 2014-02-19 17:30:54 +0000 | |||
18 | +++ debian/patches/series 2014-03-10 06:10:45 +0000 | |||
19 | @@ -17,3 +17,4 @@ | |||
20 | 17 | lp1048520_delay_pin_dialog_in_greeter.patch | 17 | lp1048520_delay_pin_dialog_in_greeter.patch |
21 | 18 | rebuild_menu_after_init.patch | 18 | rebuild_menu_after_init.patch |
22 | 19 | 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch | 19 | 0001_Move_on_with_enter_in_the_country_page_of_the_new_mobile_wizard.patch |
23 | 20 | set_atk_relations.patch | ||
24 | 20 | 21 | ||
25 | === added file 'debian/patches/set_atk_relations.patch' | |||
26 | --- debian/patches/set_atk_relations.patch 1970-01-01 00:00:00 +0000 | |||
27 | +++ debian/patches/set_atk_relations.patch 2014-03-10 06:10:45 +0000 | |||
28 | @@ -0,0 +1,402 @@ | |||
29 | 1 | Index: set-atk-label-relations/src/applet-dialogs.c | ||
30 | 2 | =================================================================== | ||
31 | 3 | --- set-atk-label-relations.orig/src/applet-dialogs.c 2014-02-07 17:56:44.471316676 +1100 | ||
32 | 4 | +++ set-atk-label-relations/src/applet-dialogs.c 2014-02-07 17:59:46.947321348 +1100 | ||
33 | 5 | @@ -397,6 +397,10 @@ | ||
34 | 6 | GtkWidget* speed_label, *sec_label = NULL; | ||
35 | 7 | const GSList *addresses; | ||
36 | 8 | gboolean show_security = FALSE; | ||
37 | 9 | + GtkWidget *desc_widget = NULL; | ||
38 | 10 | + GtkWidget *data_widget = NULL; | ||
39 | 11 | + AtkObject *desc_object = NULL; | ||
40 | 12 | + AtkObject *data_object = NULL; | ||
41 | 13 | |||
42 | 14 | table = GTK_TABLE (gtk_table_new (12, 2, FALSE)); | ||
43 | 15 | gtk_table_set_col_spacings (table, 12); | ||
44 | 16 | @@ -432,9 +436,15 @@ | ||
45 | 17 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
46 | 18 | row++; | ||
47 | 19 | |||
48 | 20 | - gtk_table_attach (table, create_info_label (_("Interface:"), FALSE), | ||
49 | 21 | + desc_widget = create_info_label (_("Interface:"), FALSE); | ||
50 | 22 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
51 | 23 | + data_widget = create_info_label (str, TRUE); | ||
52 | 24 | + data_object = gtk_widget_get_accessible (data_widget); | ||
53 | 25 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
54 | 26 | + | ||
55 | 27 | + gtk_table_attach (table, desc_widget, | ||
56 | 28 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
57 | 29 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
58 | 30 | + gtk_table_attach (table, data_widget, | ||
59 | 31 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
60 | 32 | g_free (str); | ||
61 | 33 | row++; | ||
62 | 34 | @@ -448,17 +458,33 @@ | ||
63 | 35 | else if (NM_IS_DEVICE_WIMAX (device)) | ||
64 | 36 | str = g_strdup (nm_device_wimax_get_hw_address (NM_DEVICE_WIMAX (device))); | ||
65 | 37 | |||
66 | 38 | - gtk_table_attach (table, create_info_label (_("Hardware Address:"), FALSE), | ||
67 | 39 | + desc_widget = create_info_label (_("Hardware Address:"), FALSE); | ||
68 | 40 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
69 | 41 | + data_widget = create_info_label (str, TRUE); | ||
70 | 42 | + data_object = gtk_widget_get_accessible (data_widget); | ||
71 | 43 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
72 | 44 | + | ||
73 | 45 | + gtk_table_attach (table, desc_widget, | ||
74 | 46 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
75 | 47 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
76 | 48 | + gtk_table_attach (table, data_widget, | ||
77 | 49 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
78 | 50 | g_free (str); | ||
79 | 51 | + desc_widget = NULL; | ||
80 | 52 | + desc_object = NULL; | ||
81 | 53 | + data_widget = NULL; | ||
82 | 54 | + data_object = NULL; | ||
83 | 55 | row++; | ||
84 | 56 | |||
85 | 57 | /* Driver */ | ||
86 | 58 | - gtk_table_attach (table, create_info_label (_("Driver:"), FALSE), | ||
87 | 59 | + desc_widget = create_info_label (_("Driver:"), FALSE); | ||
88 | 60 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
89 | 61 | + data_object = create_info_label (nm_device_get_driver (device), TRUE); | ||
90 | 62 | + data_object = gtk_widget_get_accessible (data_widget); | ||
91 | 63 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
92 | 64 | + | ||
93 | 65 | + gtk_table_attach (table, desc_widget, | ||
94 | 66 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
95 | 67 | - gtk_table_attach (table, create_info_label (nm_device_get_driver (device), TRUE), | ||
96 | 68 | + gtk_table_attach (table, data_widget, | ||
97 | 69 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
98 | 70 | row++; | ||
99 | 71 | |||
100 | 72 | @@ -485,20 +511,36 @@ | ||
101 | 73 | gtk_label_set_text (GTK_LABEL(speed_label), str ? str : C_("Speed", "Unknown")); | ||
102 | 74 | g_free (str); | ||
103 | 75 | |||
104 | 76 | - gtk_table_attach (table, create_info_label (_("Speed:"), FALSE), | ||
105 | 77 | + desc_widget = create_info_label (_("Speed:"), FALSE); | ||
106 | 78 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
107 | 79 | + data_object = gtk_widget_get_accessible (speed_label); | ||
108 | 80 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
109 | 81 | + | ||
110 | 82 | + gtk_table_attach (table, desc_widget, | ||
111 | 83 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
112 | 84 | gtk_table_attach (table, speed_label, | ||
113 | 85 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
114 | 86 | + desc_widget = NULL; | ||
115 | 87 | + desc_object = NULL; | ||
116 | 88 | + data_object = NULL; | ||
117 | 89 | row++; | ||
118 | 90 | |||
119 | 91 | /* Security */ | ||
120 | 92 | if (show_security) { | ||
121 | 93 | sec_label = create_info_label_security (connection); | ||
122 | 94 | if (sec_label) { | ||
123 | 95 | - gtk_table_attach (table, create_info_label (_("Security:"), FALSE), | ||
124 | 96 | + desc_widget = create_info_label (_("Security:"), FALSE); | ||
125 | 97 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
126 | 98 | + data_object = gtk_widget_get_accessible (sec_label); | ||
127 | 99 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
128 | 100 | + | ||
129 | 101 | + gtk_table_attach (table, desc_widget, | ||
130 | 102 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
131 | 103 | gtk_table_attach (table, sec_label, | ||
132 | 104 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
133 | 105 | + desc_widget = NULL; | ||
134 | 106 | + desc_object = NULL; | ||
135 | 107 | + data_object = NULL; | ||
136 | 108 | row++; | ||
137 | 109 | } | ||
138 | 110 | } | ||
139 | 111 | @@ -508,7 +550,12 @@ | ||
140 | 112 | |||
141 | 113 | /* CINR */ | ||
142 | 114 | cinr_label = create_info_label ("", TRUE); | ||
143 | 115 | - gtk_table_attach (table, create_info_label (_("CINR:"), FALSE), | ||
144 | 116 | + desc_widget = create_info_label (_("CINR:"), FALSE); | ||
145 | 117 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
146 | 118 | + data_object = gtk_widget_get_accessible (cinr_label); | ||
147 | 119 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
148 | 120 | + | ||
149 | 121 | + gtk_table_attach (table, desc_widget, | ||
150 | 122 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
151 | 123 | gtk_table_attach (table, cinr_label, | ||
152 | 124 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
153 | 125 | @@ -517,11 +564,19 @@ | ||
154 | 126 | "notify::" NM_DEVICE_WIMAX_CINR, | ||
155 | 127 | G_CALLBACK (wimax_cinr_changed_cb)); | ||
156 | 128 | wimax_cinr_changed_cb (device, NULL, cinr_label); | ||
157 | 129 | + desc_widget = NULL; | ||
158 | 130 | + desc_object = NULL; | ||
159 | 131 | + data_object = NULL; | ||
160 | 132 | row++; | ||
161 | 133 | |||
162 | 134 | /* Base Station ID */ | ||
163 | 135 | bsid_label = create_info_label ("", TRUE); | ||
164 | 136 | - gtk_table_attach (table, create_info_label (_("BSID:"), FALSE), | ||
165 | 137 | + desc_widget = create_info_label (_("BSID:"), FALSE); | ||
166 | 138 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
167 | 139 | + data_object = gtk_widget_get_accessible (bsid_label); | ||
168 | 140 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
169 | 141 | + | ||
170 | 142 | + gtk_table_attach (table, desc_widget, | ||
171 | 143 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
172 | 144 | gtk_table_attach (table, bsid_label, | ||
173 | 145 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
174 | 146 | @@ -530,6 +585,9 @@ | ||
175 | 147 | "notify::" NM_DEVICE_WIMAX_BSID, | ||
176 | 148 | G_CALLBACK (wimax_bsid_changed_cb)); | ||
177 | 149 | wimax_bsid_changed_cb (device, NULL, bsid_label); | ||
178 | 150 | + desc_widget = NULL; | ||
179 | 151 | + desc_object = NULL; | ||
180 | 152 | + data_object = NULL; | ||
181 | 153 | row++; | ||
182 | 154 | } | ||
183 | 155 | |||
184 | 156 | @@ -549,12 +607,22 @@ | ||
185 | 157 | def_addr = addresses->data; | ||
186 | 158 | |||
187 | 159 | /* Address */ | ||
188 | 160 | - gtk_table_attach (table, create_info_label (_("IP Address:"), FALSE), | ||
189 | 161 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
190 | 162 | str = def_addr ? ip4_address_as_string (nm_ip4_address_get_address (def_addr)) : g_strdup (C_("Address", "Unknown")); | ||
191 | 163 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
192 | 164 | + desc_widget = create_info_label (_("IP Address:"), FALSE); | ||
193 | 165 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
194 | 166 | + data_widget = create_info_label (str, TRUE); | ||
195 | 167 | + data_object = gtk_widget_get_accessible (data_widget); | ||
196 | 168 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
197 | 169 | + | ||
198 | 170 | + gtk_table_attach (table, desc_widget, | ||
199 | 171 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
200 | 172 | + gtk_table_attach (table, data_widget, | ||
201 | 173 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
202 | 174 | g_free (str); | ||
203 | 175 | + desc_widget = NULL; | ||
204 | 176 | + desc_object = NULL; | ||
205 | 177 | + data_widget = NULL; | ||
206 | 178 | + data_object = NULL; | ||
207 | 179 | row++; | ||
208 | 180 | |||
209 | 181 | /* Broadcast */ | ||
210 | 182 | @@ -565,62 +633,122 @@ | ||
211 | 183 | bcast = htonl (network | hostmask); | ||
212 | 184 | } | ||
213 | 185 | |||
214 | 186 | - gtk_table_attach (table, create_info_label (_("Broadcast Address:"), FALSE), | ||
215 | 187 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
216 | 188 | str = def_addr ? ip4_address_as_string (bcast) : g_strdup (C_("Address", "Unknown")); | ||
217 | 189 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
218 | 190 | + desc_widget = create_info_label (_("Broadcast Address:"), FALSE); | ||
219 | 191 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
220 | 192 | + data_widget = create_info_label (str, TRUE); | ||
221 | 193 | + data_object = gtk_widget_get_accessible (data_widget); | ||
222 | 194 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
223 | 195 | + | ||
224 | 196 | + gtk_table_attach (table, desc_widget, | ||
225 | 197 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
226 | 198 | + gtk_table_attach (table, data_widget, | ||
227 | 199 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
228 | 200 | g_free (str); | ||
229 | 201 | + desc_widget = NULL; | ||
230 | 202 | + desc_object = NULL; | ||
231 | 203 | + data_widget = NULL; | ||
232 | 204 | + data_object = NULL; | ||
233 | 205 | row++; | ||
234 | 206 | |||
235 | 207 | /* Prefix */ | ||
236 | 208 | - gtk_table_attach (table, create_info_label (_("Subnet Mask:"), FALSE), | ||
237 | 209 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
238 | 210 | str = def_addr ? ip4_address_as_string (netmask) : g_strdup (C_("Subnet Mask", "Unknown")); | ||
239 | 211 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
240 | 212 | + desc_widget = create_info_label (_("Subnet Mask:"), FALSE); | ||
241 | 213 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
242 | 214 | + data_widget = create_info_label (str, TRUE); | ||
243 | 215 | + data_object = gtk_widget_get_accessible (data_widget); | ||
244 | 216 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
245 | 217 | + | ||
246 | 218 | + gtk_table_attach (table, desc_widget, | ||
247 | 219 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0);; | ||
248 | 220 | + gtk_table_attach (table, data_widget, | ||
249 | 221 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
250 | 222 | g_free (str); | ||
251 | 223 | + desc_widget = NULL; | ||
252 | 224 | + desc_object = NULL; | ||
253 | 225 | + data_widget = NULL; | ||
254 | 226 | + data_object = NULL; | ||
255 | 227 | row++; | ||
256 | 228 | |||
257 | 229 | /* Gateway */ | ||
258 | 230 | if (def_addr && nm_ip4_address_get_gateway (def_addr)) { | ||
259 | 231 | - gtk_table_attach (table, create_info_label (_("Default Route:"), FALSE), | ||
260 | 232 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
261 | 233 | str = ip4_address_as_string (nm_ip4_address_get_gateway (def_addr)); | ||
262 | 234 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
263 | 235 | + desc_widget = create_info_label (_("Default Route:"), FALSE); | ||
264 | 236 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
265 | 237 | + data_widget = create_info_label (str, TRUE); | ||
266 | 238 | + data_object = gtk_widget_get_accessible (data_widget); | ||
267 | 239 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
268 | 240 | + | ||
269 | 241 | + gtk_table_attach (table, desc_widget, | ||
270 | 242 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
271 | 243 | + gtk_table_attach (table, data_widget, | ||
272 | 244 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
273 | 245 | g_free (str); | ||
274 | 246 | + desc_widget = NULL; | ||
275 | 247 | + desc_object = NULL; | ||
276 | 248 | + data_widget = NULL; | ||
277 | 249 | + data_object = NULL; | ||
278 | 250 | row++; | ||
279 | 251 | } | ||
280 | 252 | |||
281 | 253 | /* DNS */ | ||
282 | 254 | dns = def_addr ? nm_ip4_config_get_nameservers (ip4_config) : NULL; | ||
283 | 255 | if (dns && dns->len) { | ||
284 | 256 | - gtk_table_attach (table, create_info_label (_("Primary DNS:"), FALSE), | ||
285 | 257 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
286 | 258 | str = ip4_address_as_string (g_array_index (dns, guint32, 0)); | ||
287 | 259 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
288 | 260 | + desc_widget = create_info_label (_("Primary DNS:"), FALSE); | ||
289 | 261 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
290 | 262 | + data_widget = create_info_label (str, TRUE); | ||
291 | 263 | + data_object = gtk_widget_get_accessible (data_widget); | ||
292 | 264 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
293 | 265 | + | ||
294 | 266 | + gtk_table_attach (table, desc_widget, | ||
295 | 267 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
296 | 268 | + gtk_table_attach (table, data_widget, | ||
297 | 269 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
298 | 270 | g_free (str); | ||
299 | 271 | + desc_widget = NULL; | ||
300 | 272 | + desc_object = NULL; | ||
301 | 273 | + data_widget = NULL; | ||
302 | 274 | + data_object = NULL; | ||
303 | 275 | row++; | ||
304 | 276 | |||
305 | 277 | if (dns->len > 1) { | ||
306 | 278 | - gtk_table_attach (table, create_info_label (_("Secondary DNS:"), FALSE), | ||
307 | 279 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
308 | 280 | str = ip4_address_as_string (g_array_index (dns, guint32, 1)); | ||
309 | 281 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
310 | 282 | + desc_widget = create_info_label (_("Secondary DNS:"), FALSE); | ||
311 | 283 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
312 | 284 | + data_widget = create_info_label (str, TRUE); | ||
313 | 285 | + data_object = gtk_widget_get_accessible (data_widget); | ||
314 | 286 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
315 | 287 | + | ||
316 | 288 | + gtk_table_attach (table, desc_widget, | ||
317 | 289 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
318 | 290 | + gtk_table_attach (table, data_widget, | ||
319 | 291 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
320 | 292 | g_free (str); | ||
321 | 293 | + desc_widget = NULL; | ||
322 | 294 | + desc_object = NULL; | ||
323 | 295 | + data_widget = NULL; | ||
324 | 296 | + data_object = NULL; | ||
325 | 297 | row++; | ||
326 | 298 | } | ||
327 | 299 | |||
328 | 300 | if (dns->len > 2) { | ||
329 | 301 | - gtk_table_attach (table, create_info_label (_("Ternary DNS:"), FALSE), | ||
330 | 302 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
331 | 303 | str = ip4_address_as_string (g_array_index (dns, guint32, 2)); | ||
332 | 304 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
333 | 305 | + desc_widget = create_info_label (_("Ternary DNS:"), FALSE); | ||
334 | 306 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
335 | 307 | + data_widget = create_info_label (str, TRUE); | ||
336 | 308 | + data_object = gtk_widget_get_accessible (data_widget); | ||
337 | 309 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
338 | 310 | + | ||
339 | 311 | + gtk_table_attach (table, desc_widget, | ||
340 | 312 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
341 | 313 | + gtk_table_attach (table, data_widget, | ||
342 | 314 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
343 | 315 | g_free (str); | ||
344 | 316 | + desc_widget = NULL; | ||
345 | 317 | + desc_object = NULL; | ||
346 | 318 | + data_widget = NULL; | ||
347 | 319 | + data_object = NULL; | ||
348 | 320 | row++; | ||
349 | 321 | } | ||
350 | 322 | } | ||
351 | 323 | @@ -656,27 +784,47 @@ | ||
352 | 324 | char *tmp_addr; | ||
353 | 325 | guint32 prefix; | ||
354 | 326 | |||
355 | 327 | - gtk_table_attach (table, create_info_label (_("IP Address:"), FALSE), | ||
356 | 328 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
357 | 329 | tmp_addr = ip6_address_as_string (nm_ip6_address_get_address (def6_addr)); | ||
358 | 330 | prefix = nm_ip6_address_get_prefix (def6_addr); | ||
359 | 331 | str = g_strdup_printf ("%s/%d", tmp_addr, prefix); | ||
360 | 332 | g_free (tmp_addr); | ||
361 | 333 | |||
362 | 334 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
363 | 335 | + desc_widget = create_info_label (_("IP Address:"), FALSE); | ||
364 | 336 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
365 | 337 | + data_widget = create_info_label (str, TRUE); | ||
366 | 338 | + data_object = gtk_widget_get_accessible (data_widget); | ||
367 | 339 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
368 | 340 | + | ||
369 | 341 | + gtk_table_attach (table, desc_widget, | ||
370 | 342 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
371 | 343 | + gtk_table_attach (table, data_widget, | ||
372 | 344 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
373 | 345 | g_free (str); | ||
374 | 346 | + desc_widget = NULL; | ||
375 | 347 | + desc_object = NULL; | ||
376 | 348 | + data_widget = NULL; | ||
377 | 349 | + data_object = NULL; | ||
378 | 350 | row++; | ||
379 | 351 | } | ||
380 | 352 | |||
381 | 353 | /* Gateway */ | ||
382 | 354 | if (def6_addr && nm_ip6_address_get_gateway (def6_addr)) { | ||
383 | 355 | - gtk_table_attach (table, create_info_label (_("Default Route:"), FALSE), | ||
384 | 356 | - 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
385 | 357 | str = ip6_address_as_string (nm_ip6_address_get_gateway (def6_addr)); | ||
386 | 358 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
387 | 359 | + desc_widget = create_info_label (_("Default Route:"), FALSE); | ||
388 | 360 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
389 | 361 | + data_widget = create_info_label (str, TRUE); | ||
390 | 362 | + data_object = gtk_widget_get_accessible (data_widget); | ||
391 | 363 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
392 | 364 | + | ||
393 | 365 | + gtk_table_attach (table, desc_widget, | ||
394 | 366 | + 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
395 | 367 | + gtk_table_attach (table, data_widget, | ||
396 | 368 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
397 | 369 | g_free (str); | ||
398 | 370 | + desc_widget = NULL; | ||
399 | 371 | + data_widget = NULL; | ||
400 | 372 | + desc_object = NULL; | ||
401 | 373 | + data_object = NULL; | ||
402 | 374 | row++; | ||
403 | 375 | } | ||
404 | 376 | |||
405 | 377 | @@ -685,13 +833,22 @@ | ||
406 | 378 | |||
407 | 379 | for (i = 0; dns6 && i < 3 ; dns6 = g_slist_next (dns6), i++) { | ||
408 | 380 | char *label[] = { "Primary DNS:", "Secondary DNS:", "Ternary DNS:" }; | ||
409 | 381 | + str = ip6_address_as_string (dns6->data); | ||
410 | 382 | + desc_widget = create_info_label (_(label[i]), FALSE); | ||
411 | 383 | + desc_object = gtk_widget_get_accessible (desc_widget); | ||
412 | 384 | + data_widget = create_info_label (str, TRUE); | ||
413 | 385 | + data_object = gtk_widget_get_accessible (data_widget); | ||
414 | 386 | + atk_object_add_relationship (desc_object, ATK_RELATION_LABEL_FOR, data_object); | ||
415 | 387 | |||
416 | 388 | - gtk_table_attach (table, create_info_label (_(label[i]), FALSE), | ||
417 | 389 | + gtk_table_attach (table, desc_widget, | ||
418 | 390 | 0, 1, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
419 | 391 | - str = ip6_address_as_string (dns6->data); | ||
420 | 392 | - gtk_table_attach (table, create_info_label (str, TRUE), | ||
421 | 393 | + gtk_table_attach (table, data_widget, | ||
422 | 394 | 1, 2, row, row + 1, GTK_FILL, GTK_FILL, 0, 0); | ||
423 | 395 | g_free (str); | ||
424 | 396 | + desc_widget = NULL; | ||
425 | 397 | + data_widget = NULL; | ||
426 | 398 | + desc_object = NULL; | ||
427 | 399 | + data_object = NULL; | ||
428 | 400 | row++; | ||
429 | 401 | } | ||
430 | 402 |
Has this patch been sent upstream?