Unity

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

  1. bug844927
  2. Merge into trunk
Proposed by Alejandro Piñeiro
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) Approve
Alex Launi Pending
Review via email: mp+74796@code.launchpad.net
To post a comment you must log in.
Revision history for this message
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
=== modified file 'plugins/unityshell/src/unitya11y.cpp'
--- plugins/unityshell/src/unitya11y.cpp 2011-08-24 14:56:40 +0000
+++ plugins/unityshell/src/unitya11y.cpp 2011-09-09 14:08:33 +0000
@@ -113,14 +113,17 @@
113get_atk_bridge_path(void)113get_atk_bridge_path(void)
114{114{
115 GSettings* atspi_settings = NULL;115 GSettings* atspi_settings = NULL;
116 GVariant *variant = NULL;
116 char* value = NULL;117 char* value = NULL;
117118
118 if (!has_gsettings_schema(AT_SPI_SCHEMA))119 if (!has_gsettings_schema(AT_SPI_SCHEMA))
119 return NULL;120 return NULL;
120121
121 atspi_settings = g_settings_new(AT_SPI_SCHEMA);122 atspi_settings = g_settings_new(AT_SPI_SCHEMA);
122 value = g_settings_get_string(atspi_settings, ATK_BRIDGE_LOCATION_KEY);123 variant = g_settings_get_value (atspi_settings, ATK_BRIDGE_LOCATION_KEY);
124 value = g_variant_dup_bytestring (variant, NULL);
123125
126 g_variant_unref (variant);
124 g_object_unref(atspi_settings);127 g_object_unref(atspi_settings);
125128
126 return value;129 return value;
127130
=== modified file 'services/panel-a11y.c'
--- services/panel-a11y.c 2011-07-13 17:15:15 +0000
+++ services/panel-a11y.c 2011-09-09 14:08:33 +0000
@@ -73,14 +73,17 @@
73get_atk_bridge_path (void)73get_atk_bridge_path (void)
74{74{
75 GSettings *atspi_settings = NULL;75 GSettings *atspi_settings = NULL;
76 GVariant *variant = NULL;
76 char *value = NULL;77 char *value = NULL;
7778
78 if (!has_gsettings_schema (AT_SPI_SCHEMA))79 if (!has_gsettings_schema (AT_SPI_SCHEMA))
79 return NULL;80 return NULL;
8081
81 atspi_settings = g_settings_new (AT_SPI_SCHEMA);82 atspi_settings = g_settings_new(AT_SPI_SCHEMA);
82 value = g_settings_get_string (atspi_settings, ATK_BRIDGE_LOCATION_KEY);83 variant = g_settings_get_value (atspi_settings, ATK_BRIDGE_LOCATION_KEY);
84 value = g_variant_dup_bytestring (variant, NULL);
8385
86 g_variant_unref (variant);
84 g_object_unref (atspi_settings);87 g_object_unref (atspi_settings);
8588
86 return value;89 return value;