Merge lp:~apinheiro/unity/bug844927 into lp:unity

Proposed by Alejandro Piñeiro on 2011-09-09
Status: Merged
Merged at revision: 1531
Proposed branch: lp:~apinheiro/unity/bug844927
Merge into: lp:unity
Diff against target: 46 lines (+9/-3)
2 files modified
plugins/unityshell/src/unitya11y.cpp (+4/-1)
services/panel-a11y.c (+5/-2)
To merge this branch: bzr merge lp:~apinheiro/unity/bug844927
Reviewer Review Type Date Requested Status
Neil J. Patel (community) 2011-09-09 Approve on 2011-09-12
Alex Launi 2011-09-09 Pending
Review via email: mp+74796@code.launchpad.net
To post a comment you must log in.
Neil J. Patel (njpatel) wrote :

Looks good, approved.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'plugins/unityshell/src/unitya11y.cpp'
2--- plugins/unityshell/src/unitya11y.cpp 2011-08-24 14:56:40 +0000
3+++ plugins/unityshell/src/unitya11y.cpp 2011-09-09 14:08:33 +0000
4@@ -113,14 +113,17 @@
5 get_atk_bridge_path(void)
6 {
7 GSettings* atspi_settings = NULL;
8+ GVariant *variant = NULL;
9 char* value = NULL;
10
11 if (!has_gsettings_schema(AT_SPI_SCHEMA))
12 return NULL;
13
14 atspi_settings = g_settings_new(AT_SPI_SCHEMA);
15- value = g_settings_get_string(atspi_settings, ATK_BRIDGE_LOCATION_KEY);
16+ variant = g_settings_get_value (atspi_settings, ATK_BRIDGE_LOCATION_KEY);
17+ value = g_variant_dup_bytestring (variant, NULL);
18
19+ g_variant_unref (variant);
20 g_object_unref(atspi_settings);
21
22 return value;
23
24=== modified file 'services/panel-a11y.c'
25--- services/panel-a11y.c 2011-07-13 17:15:15 +0000
26+++ services/panel-a11y.c 2011-09-09 14:08:33 +0000
27@@ -73,14 +73,17 @@
28 get_atk_bridge_path (void)
29 {
30 GSettings *atspi_settings = NULL;
31+ GVariant *variant = NULL;
32 char *value = NULL;
33
34 if (!has_gsettings_schema (AT_SPI_SCHEMA))
35 return NULL;
36
37- atspi_settings = g_settings_new (AT_SPI_SCHEMA);
38- value = g_settings_get_string (atspi_settings, ATK_BRIDGE_LOCATION_KEY);
39+ atspi_settings = g_settings_new(AT_SPI_SCHEMA);
40+ variant = g_settings_get_value (atspi_settings, ATK_BRIDGE_LOCATION_KEY);
41+ value = g_variant_dup_bytestring (variant, NULL);
42
43+ g_variant_unref (variant);
44 g_object_unref (atspi_settings);
45
46 return value;