Merge lp:~mc-return/unity/unity.merge-fix-typos into lp:unity
- unity.merge-fix-typos
- Merge into trunk
Status: | Merged |
---|---|
Approved by: | Tim Penhey |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2626 |
Proposed branch: | lp:~mc-return/unity/unity.merge-fix-typos |
Merge into: | lp:unity |
Diff against target: |
447 lines (+66/-66) 15 files modified
launcher/LauncherController.cpp (+2/-2) panel/PanelMenuView.cpp (+2/-2) plugins/unityshell/src/nux-area-accessible.cpp (+23/-23) plugins/unityshell/src/nux-area-accessible.h (+2/-2) plugins/unityshell/src/nux-base-window-accessible.cpp (+5/-5) plugins/unityshell/src/nux-layout-accessible.cpp (+1/-1) plugins/unityshell/src/nux-object-accessible.cpp (+4/-4) plugins/unityshell/src/nux-view-accessible.cpp (+3/-3) plugins/unityshell/src/unity-root-accessible.cpp (+1/-1) plugins/unityshell/src/unitya11y.cpp (+14/-14) plugins/unityshell/src/unitya11ytests.cpp (+1/-1) plugins/unityshell/src/unityshell.cpp (+3/-3) shortcuts/ShortcutController.cpp (+2/-2) shortcuts/StandaloneShortcuts.cpp (+1/-1) unity-shared/UBusMessages.h (+2/-2) |
To merge this branch: | bzr merge lp:~mc-return/unity/unity.merge-fix-typos |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Penhey (community) | Approve | ||
Brandon Schaefer (community) | Approve | ||
MC Return (community) | Needs Resubmitting | ||
Review via email: mp+116216@code.launchpad.net |
This proposal supersedes a proposal from 2012-07-09.
Commit message
Fixed many minor typos.
Description of the change
Fixes several minor typos
Tim Penhey (thumper) wrote : Posted in a previous version of this proposal | # |
MC Return (mc-return) wrote : | # |
Fixed. :)
Unity Merger (unity-merger) wrote : | # |
The Jenkins job https:/
Not merging it.
Tim Penhey (thumper) wrote : | # |
It took me a while to figure out exactly what was going on.
You changed
UBUS_LAUNCHER_
to
UBUS_LAUNCHER_
But you didn't update the original source definition. Can you find and fix that one too plz?
MC Return (mc-return) wrote : | # |
> It took me a while to figure out exactly what was going on.
>
> You changed
> UBUS_LAUNCHER_
> to
> UBUS_LAUNCHER_
>
> But you didn't update the original source definition. Can you find and fix
> that one too plz?
Oh, sorry. I should have checked that one myself. I hope this time I got all instances.
Should be fixed now.
Brandon Schaefer (brandontschaefer) wrote : | # |
Looks good.
Unity Merger (unity-merger) wrote : | # |
The Jenkins job https:/
Not merging it.
Unity Merger (unity-merger) wrote : | # |
The Jenkins job https:/
Not merging it.
MC Return (mc-return) wrote : | # |
There are still SWTICHER->SWITCHER typos I've missed. I fixed it locally, but at the moment I am unfortunately having problems updating my branches (Write failed: Broken pipe).
MC Return (mc-return) : | # |
Brandon Schaefer (brandontschaefer) wrote : | # |
Still looks good :).
Tim Penhey (thumper) : | # |
Preview Diff
1 | === modified file 'launcher/LauncherController.cpp' |
2 | --- launcher/LauncherController.cpp 2012-08-10 10:08:13 +0000 |
3 | +++ launcher/LauncherController.cpp 2012-08-17 21:27:20 +0000 |
4 | @@ -1003,7 +1003,7 @@ |
5 | } |
6 | else |
7 | { |
8 | - pimpl->ubus.SendMessage(UBUS_LAUNCHER_START_KEY_SWTICHER, |
9 | + pimpl->ubus.SendMessage(UBUS_LAUNCHER_START_KEY_SWITCHER, |
10 | g_variant_new_int32(pimpl->keyboard_launcher_->monitor)); |
11 | } |
12 | |
13 | @@ -1067,7 +1067,7 @@ |
14 | } |
15 | else |
16 | { |
17 | - pimpl->ubus.SendMessage(UBUS_LAUNCHER_END_KEY_SWTICHER, |
18 | + pimpl->ubus.SendMessage(UBUS_LAUNCHER_END_KEY_SWITCHER, |
19 | g_variant_new_boolean(pimpl->keynav_restore_window_)); |
20 | } |
21 | |
22 | |
23 | === modified file 'panel/PanelMenuView.cpp' |
24 | --- panel/PanelMenuView.cpp 2012-07-30 17:09:43 +0000 |
25 | +++ panel/PanelMenuView.cpp 2012-08-17 21:27:20 +0000 |
26 | @@ -156,8 +156,8 @@ |
27 | |
28 | _ubus_manager.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavStarted)); |
29 | _ubus_manager.RegisterInterest(UBUS_LAUNCHER_END_KEY_NAV, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavEnded)); |
30 | - _ubus_manager.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWTICHER, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavStarted)); |
31 | - _ubus_manager.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWTICHER, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavEnded)); |
32 | + _ubus_manager.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWITCHER, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavStarted)); |
33 | + _ubus_manager.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWITCHER, sigc::mem_fun(this, &PanelMenuView::OnLauncherKeyNavEnded)); |
34 | _ubus_manager.RegisterInterest(UBUS_LAUNCHER_SELECTION_CHANGED, sigc::mem_fun(this, &PanelMenuView::OnLauncherSelectionChanged)); |
35 | |
36 | _fade_in_animator.animation_updated.connect(sigc::mem_fun(this, &PanelMenuView::OnFadeInChanged)); |
37 | |
38 | === modified file 'plugins/unityshell/src/nux-area-accessible.cpp' |
39 | --- plugins/unityshell/src/nux-area-accessible.cpp 2012-03-14 06:24:18 +0000 |
40 | +++ plugins/unityshell/src/nux-area-accessible.cpp 2012-08-17 21:27:20 +0000 |
41 | @@ -26,26 +26,26 @@ |
42 | * nux::Area, exposing the common elements on each basic individual |
43 | * element (position, extents, etc) |
44 | * |
45 | - * In this object is also implemented the main support for the focused |
46 | - * object. This is complex due several reasons: |
47 | - * |
48 | - * * We need to ensure the proper order when the objects gets the focus |
49 | - * |
50 | - * * It doesn't make too sense to give the focus to an object that it |
51 | - * is inside a inactive window, so it is also convenient to emit |
52 | + * In this object the main support for the focused object is also |
53 | + * implemented. This is complex due to several reasons: |
54 | + * |
55 | + * * We need to ensure the proper order when the objects get the focus |
56 | + * |
57 | + * * It doesn't make sense to give the focus to an object that is |
58 | + * inside an inactive window too, so it is also convenient to emit |
59 | * the window:active event before the focus change. |
60 | * |
61 | - * => this is the reason there is implemented a system to delay the |
62 | - * focus notification until the top level window became active |
63 | + * => this is the reason why there is a system to delay the focus |
64 | + * notification, until the top level window becomes active, implemented |
65 | * |
66 | * * But the main complexity comes from the fact that not all the |
67 | - * objects on unity are implementing key nav in the same way. |
68 | - * |
69 | - * * Launcher uses exclusively InputArea methods like |
70 | - * SetKeyboardFocus, OnStartKeyboardReceiver, etc. This is the |
71 | - * key focus at a low level abstraction |
72 | - * |
73 | - * * Dash objects uses the events from Focusable. But in the same |
74 | + * objects of Unity are implementing key nav the same way. |
75 | + * |
76 | + * * The Launcher uses InputArea methods like |
77 | + * SetKeyboardFocus, OnStartKeyboardReceiver, etc exclusively. |
78 | + * This is the key focus at a low level abstraction |
79 | + * |
80 | + * * Dash objects use the events from Focusable. But in the same |
81 | * way, they require the low level key focus (OnStartFocus) and |
82 | * so on |
83 | * |
84 | @@ -179,10 +179,10 @@ |
85 | atk_component_add_focus_handler(ATK_COMPONENT(accessible), |
86 | nux_area_accessible_focus_handler); |
87 | |
88 | - /* NOTE: we can't search for the parent window on initilization as a |
89 | - general rule, or we could enter on a infinite loop. At area this |
90 | + /* NOTE: we can't search for the parent window on initialization as a |
91 | + general rule, or we could enter an infinite loop. At area this |
92 | is done on the focus event. On the Switcher this is done on their |
93 | - initialize itself */ |
94 | + initialization itself */ |
95 | } |
96 | |
97 | static AtkObject* |
98 | @@ -210,7 +210,7 @@ |
99 | } |
100 | |
101 | /* |
102 | - * Checks if the parent actor, and his parent, etc is all visible |
103 | + * Checks if the parent actor, and his parent, etc are all visible |
104 | * Used to check the showing state |
105 | */ |
106 | static gboolean |
107 | @@ -349,7 +349,7 @@ |
108 | |
109 | //area = dynamic_cast<nux::Area*>(nux_object); |
110 | |
111 | - /* FIXME: SetFocused doesn't return if the force was succesful or |
112 | + /* FIXME: SetFocused doesn't return if the force was successful or |
113 | not, we suppose that this is the case like in cally and gail */ |
114 | |
115 | return TRUE; |
116 | @@ -494,7 +494,7 @@ |
117 | * This method checks if there is any pending notification, and emits |
118 | * it if it is possible |
119 | * |
120 | - * Returns: TRUE if a atk notification was emitted, FALSE otherwise |
121 | + * Returns: TRUE if an atk notification was emitted, FALSE otherwise |
122 | */ |
123 | gboolean |
124 | nux_area_accessible_check_pending_notification(NuxAreaAccessible* self) |
125 | @@ -582,7 +582,7 @@ |
126 | { |
127 | g_return_val_if_fail(NUX_IS_AREA_ACCESSIBLE(self), NULL); |
128 | |
129 | - /* Ensures that at least whe made a search for it */ |
130 | + /* At least ensure that we made a search for it */ |
131 | check_parent_window_connected(self); |
132 | |
133 | return self->priv->parent_window; |
134 | |
135 | === modified file 'plugins/unityshell/src/nux-area-accessible.h' |
136 | --- plugins/unityshell/src/nux-area-accessible.h 2011-09-22 13:08:52 +0000 |
137 | +++ plugins/unityshell/src/nux-area-accessible.h 2012-08-17 21:27:20 +0000 |
138 | @@ -49,9 +49,9 @@ |
139 | NuxObjectAccessibleClass parent_class; |
140 | |
141 | /* |
142 | - * Usually objects shouldn emit events like focus or selection |
143 | + * Usually objects shouldn't emit events like focus or selection |
144 | * changes until the toplevel window is active. This method is |
145 | - * called when the toplevel window became active. Redefine it if you |
146 | + * called when the toplevel window becomes active. Redefine it if you |
147 | * need to check any pending state change notification. |
148 | */ |
149 | gboolean(*check_pending_notification)(NuxAreaAccessible* self); |
150 | |
151 | === modified file 'plugins/unityshell/src/nux-base-window-accessible.cpp' |
152 | --- plugins/unityshell/src/nux-base-window-accessible.cpp 2011-09-22 18:54:58 +0000 |
153 | +++ plugins/unityshell/src/nux-base-window-accessible.cpp 2012-08-17 21:27:20 +0000 |
154 | @@ -26,11 +26,11 @@ |
155 | * * Expose the child of BaseWindow (the layout) |
156 | * * Window event notification (activate, deactivate, and so on) |
157 | * |
158 | - * BTW: we consider that one window is active if it has directly the |
159 | - * keyboard focus, or if one of his child has the keyboard focus (ie: |
160 | + * BTW: we consider that one window is active, if it directly has |
161 | + * keyboard focus, or if one of its children has keyboard focus (ie: |
162 | * the Launcher via GrabKeyboardFocus) |
163 | * |
164 | - * HasKeyboardFocus is not a reliable to check that: |
165 | + * HasKeyboardFocus is not reliable to check that: |
166 | * see bug https://bugs.launchpad.net/nux/+bug/745049 |
167 | * |
168 | * So we need to update the state of the objects using the information |
169 | @@ -147,7 +147,7 @@ |
170 | |
171 | atk_state_set_add_state(state_set, ATK_STATE_FOCUSABLE); |
172 | |
173 | - /* HasKeyboardFocus is not a reliable here: |
174 | + /* HasKeyboardFocus is not reliable here: |
175 | see bug https://bugs.launchpad.net/nux/+bug/745049 */ |
176 | if (self->priv->active) |
177 | { |
178 | @@ -162,7 +162,7 @@ |
179 | static void |
180 | atk_window_interface_init(AtkWindowIface* iface) |
181 | { |
182 | - /* AtkWindow just define signals at this moment */ |
183 | + /* AtkWindow just defines signals at this moment */ |
184 | } |
185 | |
186 | /* public */ |
187 | |
188 | === modified file 'plugins/unityshell/src/nux-layout-accessible.cpp' |
189 | --- plugins/unityshell/src/nux-layout-accessible.cpp 2012-07-30 16:40:22 +0000 |
190 | +++ plugins/unityshell/src/nux-layout-accessible.cpp 2012-08-17 21:27:20 +0000 |
191 | @@ -24,7 +24,7 @@ |
192 | * |
193 | * #NuxLayoutAccessible implements the required ATK interfaces of |
194 | * nux::Layout, implementing the container related methods on |
195 | - * AtkObject, in order to expose his objects |
196 | + * AtkObject, in order to expose its objects |
197 | * |
198 | */ |
199 | |
200 | |
201 | === modified file 'plugins/unityshell/src/nux-object-accessible.cpp' |
202 | --- plugins/unityshell/src/nux-object-accessible.cpp 2011-07-21 14:59:25 +0000 |
203 | +++ plugins/unityshell/src/nux-object-accessible.cpp 2012-08-17 21:27:20 +0000 |
204 | @@ -23,7 +23,7 @@ |
205 | * @see_also: nux::Object |
206 | * |
207 | * #NuxObjectAccessible implements the required ATK interfaces of |
208 | - * nux::Object, exposing the common elements on each basic individual |
209 | + * nux::Object, exposing the common elements of each basic individual |
210 | * element (position, extents, etc) |
211 | * |
212 | */ |
213 | @@ -129,11 +129,11 @@ |
214 | /** |
215 | * nux_object_accessible_get_object: |
216 | * |
217 | - * Returns the nux::Object this object is providing accessibility support. |
218 | + * Returns the nux::Object this object is providing accessibility support for. |
219 | * |
220 | * Note that there isn't a _set method. This is because setting that |
221 | - * should only be done during initilization, and it doesn't make sense |
222 | - * to change that during the life of the object. |
223 | + * should only be done during initialization, and it doesn't make sense |
224 | + * to change that during the lifetime of the object. |
225 | * |
226 | */ |
227 | nux::Object* |
228 | |
229 | === modified file 'plugins/unityshell/src/nux-view-accessible.cpp' |
230 | --- plugins/unityshell/src/nux-view-accessible.cpp 2011-09-22 13:08:52 +0000 |
231 | +++ plugins/unityshell/src/nux-view-accessible.cpp 2012-08-17 21:27:20 +0000 |
232 | @@ -165,7 +165,7 @@ |
233 | if (nux_object == NULL) /* defunct */ |
234 | return state_set; |
235 | |
236 | - /* HasKeyboardFocus is not a reliable here: |
237 | + /* HasKeyboardFocus is not reliable here: |
238 | see bug https://bugs.launchpad.net/nux/+bug/745049 */ |
239 | if (self->priv->key_focused) |
240 | atk_state_set_add_state(state_set, ATK_STATE_FOCUSED); |
241 | @@ -262,7 +262,7 @@ |
242 | { |
243 | self->priv->key_focused = focus_in; |
244 | |
245 | - /* we always led the focus notification to |
246 | + /* we always lead the focus notification to |
247 | _check_pending_notification, in order to allow the proper |
248 | window_activate -> focus_change order */ |
249 | self->priv->pending_notification = TRUE; |
250 | @@ -275,7 +275,7 @@ |
251 | NuxViewAccessible* self = NULL; |
252 | nux::Object* nux_object = NULL; |
253 | |
254 | - /* We also call parent implementation, as we are not totally |
255 | + /* We also call the parent implementation, as we are not totally |
256 | overriding check_pending_notification, just adding extra |
257 | functionality*/ |
258 | NUX_AREA_ACCESSIBLE_CLASS(nux_view_accessible_parent_class)->check_pending_notification(area_accessible); |
259 | |
260 | === modified file 'plugins/unityshell/src/unity-root-accessible.cpp' |
261 | --- plugins/unityshell/src/unity-root-accessible.cpp 2012-03-14 06:24:18 +0000 |
262 | +++ plugins/unityshell/src/unity-root-accessible.cpp 2012-08-17 21:27:20 +0000 |
263 | @@ -395,7 +395,7 @@ |
264 | sigc::bind(sigc::ptr_fun(ubus_launcher_register_interest_cb), |
265 | self)); |
266 | |
267 | - ubus_manager.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWTICHER, |
268 | + ubus_manager.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWITCHER, |
269 | sigc::bind(sigc::ptr_fun(ubus_launcher_register_interest_cb), |
270 | self)); |
271 | |
272 | |
273 | === modified file 'plugins/unityshell/src/unitya11y.cpp' |
274 | --- plugins/unityshell/src/unitya11y.cpp 2012-05-17 19:34:56 +0000 |
275 | +++ plugins/unityshell/src/unitya11y.cpp 2012-08-17 21:27:20 +0000 |
276 | @@ -82,7 +82,7 @@ |
277 | g_type_class_unref(g_type_class_ref(UNITY_TYPE_UTIL_ACCESSIBLE)); |
278 | } |
279 | |
280 | -/* This method is required because g_setting_new abort if the schema |
281 | +/* This method is required because g_setting_new aborts if the schema |
282 | is not present. */ |
283 | static gboolean |
284 | has_gsettings_schema(const gchar* schema) |
285 | @@ -224,17 +224,17 @@ |
286 | |
287 | g_free(bridge_path); |
288 | |
289 | -// NOTE: we run manually the unit tests while developing by |
290 | -// uncommenting this. Take a look to the explanation on |
291 | +// NOTE: we run the unit tests manually while developing by |
292 | +// uncommenting this. Take a look at the explanation in the |
293 | // unitya11ytests.h header for more information |
294 | |
295 | // unity_run_a11y_unit_tests (); |
296 | } |
297 | |
298 | /* |
299 | - * Finalize the related issues related with the accessibility. |
300 | + * Finalize the issues related with accessibility. |
301 | * |
302 | - * It mainly clean the resources related with the accessibility |
303 | + * It mainly cleans the resources related with accessibility |
304 | */ |
305 | void |
306 | unity_a11y_finalize(void) |
307 | @@ -259,9 +259,9 @@ |
308 | * that would be add a ->get_accessible method on the nux::View |
309 | * subclasses itself. |
310 | * |
311 | - * WARNING: as a reason the previous comment it is true. Take into |
312 | - * account that you should be careful with the order you add those |
313 | - * defines. The order will be from more specific classes to more |
314 | + * WARNING: as a reason the previous comment is true. Take into |
315 | + * account that you should be careful with the order in which you add |
316 | + * those defines. The order will be from more specific classes to more |
317 | * abstracted classes. |
318 | * |
319 | */ |
320 | @@ -327,7 +327,7 @@ |
321 | AtkObject* accessible_object) |
322 | { |
323 | /* NOTE: the pair key:value (base_object:accessible_object) could be |
324 | - already removed on on_accessible_destroy_cb. That just mean that |
325 | + already removed on on_accessible_destroy_cb. That just means that |
326 | g_hash_table_remove would return FALSE. We don't add a |
327 | debug/warning message to avoid being too verbose */ |
328 | |
329 | @@ -339,7 +339,7 @@ |
330 | GObject* where_the_object_was) |
331 | { |
332 | /* NOTE: the pair key:value (base_object:accessible_object) could be |
333 | - already removed on on_object_destroy_cb. That just mean that |
334 | + already removed on on_object_destroy_cb. That just means that |
335 | g_hash_table_remove would return FALSE. We don't add a |
336 | debug/warning message to avoid being too verbose */ |
337 | |
338 | @@ -350,9 +350,9 @@ |
339 | * Returns the accessible object of a nux::View object |
340 | * |
341 | * This method tries to: |
342 | - * * Check if area has already a accessibility object |
343 | - * * If this is the case, returns that |
344 | - * * If not, creates it and return the object |
345 | + * * Check if area already has a accessibility object |
346 | + * * If this is the case, return that |
347 | + * * If not, create it and return the object |
348 | * |
349 | * FIXME: this should be a temporal method. The best way to implement |
350 | * that would be add a ->get_accessible method on the nux::View |
351 | @@ -379,7 +379,7 @@ |
352 | g_hash_table_insert(accessible_table, object, accessible_object); |
353 | |
354 | /* there are two reasons the object should be removed from the |
355 | - * table: base object destroyed, or accessible object |
356 | + * table: base object destroyed or accessible object |
357 | * destroyed |
358 | */ |
359 | g_object_weak_ref(G_OBJECT(accessible_object), |
360 | |
361 | === modified file 'plugins/unityshell/src/unitya11ytests.cpp' |
362 | --- plugins/unityshell/src/unitya11ytests.cpp 2012-08-02 13:16:06 +0000 |
363 | +++ plugins/unityshell/src/unitya11ytests.cpp 2012-08-17 21:27:20 +0000 |
364 | @@ -48,7 +48,7 @@ |
365 | * This unit test checks if the destroy management is working: |
366 | * |
367 | * - If the state of a accessibility object is properly updated after |
368 | - * the object destruction |
369 | + * the object's destruction |
370 | * |
371 | */ |
372 | static gboolean |
373 | |
374 | === modified file 'plugins/unityshell/src/unityshell.cpp' |
375 | --- plugins/unityshell/src/unityshell.cpp 2012-08-16 13:35:30 +0000 |
376 | +++ plugins/unityshell/src/unityshell.cpp 2012-08-17 21:27:20 +0000 |
377 | @@ -341,13 +341,13 @@ |
378 | ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV, |
379 | sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav)); |
380 | |
381 | - ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWTICHER, |
382 | + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWITCHER, |
383 | sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav)); |
384 | |
385 | ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_NAV, |
386 | sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav)); |
387 | |
388 | - ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWTICHER, |
389 | + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWITCHER, |
390 | sigc::mem_fun(this, &UnityScreen::OnLauncherEndKeyNav)); |
391 | |
392 | ubus_manager_.RegisterInterest(UBUS_SWITCHER_START, |
393 | @@ -2359,7 +2359,7 @@ |
394 | auto id = value->id(); |
395 | |
396 | // iterate loop by hand rather than use std::find as this is considerably faster |
397 | - // we care about performance here becuase of the high frequency in which this function is |
398 | + // we care about performance here because of the high frequency in which this function is |
399 | // called (nearly every frame) |
400 | unsigned int size = xwns.size(); |
401 | for (unsigned int i = 0; i < size; ++i) |
402 | |
403 | === modified file 'shortcuts/ShortcutController.cpp' |
404 | --- shortcuts/ShortcutController.cpp 2012-06-18 02:57:23 +0000 |
405 | +++ shortcuts/ShortcutController.cpp 2012-08-17 21:27:20 +0000 |
406 | @@ -42,11 +42,11 @@ |
407 | ubus_manager_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED, |
408 | sigc::mem_fun(this, &Controller::OnBackgroundUpdate)); |
409 | |
410 | - ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWTICHER, [&] (GVariant*) { |
411 | + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_SWITCHER, [&] (GVariant*) { |
412 | enabled_ = false; |
413 | }); |
414 | |
415 | - ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWTICHER, [&] (GVariant*) { |
416 | + ubus_manager_.RegisterInterest(UBUS_LAUNCHER_END_KEY_SWITCHER, [&] (GVariant*) { |
417 | enabled_ = true; |
418 | }); |
419 | |
420 | |
421 | === modified file 'shortcuts/StandaloneShortcuts.cpp' |
422 | --- shortcuts/StandaloneShortcuts.cpp 2012-08-13 20:16:28 +0000 |
423 | +++ shortcuts/StandaloneShortcuts.cpp 2012-08-17 21:27:20 +0000 |
424 | @@ -64,7 +64,7 @@ |
425 | hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Switch between applications."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_forward"))); |
426 | hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Switch windows of current application."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_next_window"))); |
427 | hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Close window switch, return to app switch."), shortcut::COMPIZ_KEY_OPTION, "unityshell", "alt_tab_detail_stop"))); |
428 | - hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Moves the foucs."), shortcut::HARDCODED_OPTION, _("Cursor Left & Right")))); |
429 | + hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Switching"), "", "", _("Moves the focus."), shortcut::HARDCODED_OPTION, _("Cursor Left & Right")))); |
430 | |
431 | // Workspaces |
432 | hints.push_back(std::shared_ptr<shortcut::AbstractHint>(new shortcut::MockHint(_("Workspaces"), "", "", _("Spread workspaces."), shortcut::COMPIZ_KEY_OPTION, "expo", "expo_key"))); |
433 | |
434 | === modified file 'unity-shared/UBusMessages.h' |
435 | --- unity-shared/UBusMessages.h 2012-08-17 00:27:16 +0000 |
436 | +++ unity-shared/UBusMessages.h 2012-08-17 21:27:20 +0000 |
437 | @@ -46,8 +46,8 @@ |
438 | // get rid of keyboard-input-focus |
439 | #define UBUS_LAUNCHER_START_KEY_NAV "LAUNCHER_START_KEY_NAV" |
440 | #define UBUS_LAUNCHER_END_KEY_NAV "LAUNCHER_END_KEY_NAV" |
441 | -#define UBUS_LAUNCHER_START_KEY_SWTICHER "LAUNCHER_START_KEY_SWITCHER" |
442 | -#define UBUS_LAUNCHER_END_KEY_SWTICHER "LAUNCHER_END_KEY_SWITCHER" |
443 | +#define UBUS_LAUNCHER_START_KEY_SWITCHER "LAUNCHER_START_KEY_SWITCHER" |
444 | +#define UBUS_LAUNCHER_END_KEY_SWITCHER "LAUNCHER_END_KEY_SWITCHER" |
445 | #define UBUS_LAUNCHER_SELECTION_CHANGED "LAUNCHER_ICON_SELECTION_CHANGED" |
446 | #define UBUS_LAUNCHER_ICON_URGENT_CHANGED "LAUNCHER_ICON_URGENT_CHANGED" |
447 | #define UBUS_QUICKLIST_START_KEY_NAV "QUICKLIST_START_KEY_NAV" |
Thanks for this.
Just one point:
s/the objects destruction/the object's destruction/