[at-spi2-core] At-spi-bus-launcher signal emission fixes
- From: Mike Gorse <mgorse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [at-spi2-core] At-spi-bus-launcher signal emission fixes
- Date: Mon, 13 Feb 2012 17:30:31 +0000 (UTC)
commit 51c68cc34af24102abe4c0f7072f384f91427b23
Author: Mike Gorse <mgorse novell com>
Date: Mon Feb 13 11:32:47 2012 -0600
At-spi-bus-launcher signal emission fixes
Emit PropertiesChanged from the correct interface. Also, create
GVariantBuilders on the stack; fixes memory leaks.
bus/at-spi-bus-launcher.c | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
index 4466262..a60b70e 100644
--- a/bus/at-spi-bus-launcher.c
+++ b/bus/at-spi-bus-launcher.c
@@ -260,8 +260,8 @@ static void
handle_a11y_enabled_change (A11yBusLauncher *app, gboolean enabled,
gboolean notify_gsettings)
{
- GVariantBuilder *builder;
- GVariantBuilder *invalidated_builder;
+ GVariantBuilder builder;
+ GVariantBuilder invalidated_builder;
if (enabled == app->a11y_enabled)
return;
@@ -275,16 +275,17 @@ handle_a11y_enabled_change (A11yBusLauncher *app, gboolean enabled,
g_settings_sync ();
}
- builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
- invalidated_builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
- g_variant_builder_add (builder, "{sv}", "IsEnabled",
+ g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
+ g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
+ g_variant_builder_add (&builder, "{sv}", "IsEnabled",
g_variant_new_boolean (enabled));
g_dbus_connection_emit_signal (app->session_bus, NULL, "/org/a11y/bus",
- "org.freedesktop.DBus", "PropertiesChanged",
+ "org.freedesktop.DBus.Properties",
+ "PropertiesChanged",
g_variant_new ("(sa{sv}as)", "org.a11y.Status",
- builder,
- invalidated_builder),
+ &builder,
+ &invalidated_builder),
NULL);
}
@@ -292,8 +293,8 @@ static void
handle_screen_reader_enabled_change (A11yBusLauncher *app, gboolean enabled,
gboolean notify_gsettings)
{
- GVariantBuilder *builder;
- GVariantBuilder *invalidated_builder;
+ GVariantBuilder builder;
+ GVariantBuilder invalidated_builder;
if (enabled == app->screen_reader_enabled)
return;
@@ -312,16 +313,17 @@ handle_screen_reader_enabled_change (A11yBusLauncher *app, gboolean enabled,
g_settings_sync ();
}
- builder = g_variant_builder_new (G_VARIANT_TYPE_ARRAY);
- invalidated_builder = g_variant_builder_new (G_VARIANT_TYPE ("as"));
- g_variant_builder_add (builder, "{sv}", "ScreenReaderEnabled",
+ g_variant_builder_init (&builder, G_VARIANT_TYPE_ARRAY);
+ g_variant_builder_init (&invalidated_builder, G_VARIANT_TYPE ("as"));
+ g_variant_builder_add (&builder, "{sv}", "ScreenReaderEnabled",
g_variant_new_boolean (enabled));
g_dbus_connection_emit_signal (app->session_bus, NULL, "/org/a11y/bus",
- "org.freedesktop.DBus", "PropertiesChanged",
+ "org.freedesktop.DBus.Properties",
+ "PropertiesChanged",
g_variant_new ("(sa{sv}as)", "org.a11y.Status",
- builder,
- invalidated_builder),
+ &builder,
+ &invalidated_builder),
NULL);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]