diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-01-11 15:59:14 +0100 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-01-11 15:59:14 +0100 |
| commit | d75842ff4c8c9d78dbd5462409ab2c93600fa9a6 (patch) | |
| tree | 86def8b54a1cb6db27a3bff6c6e6caada203ad13 /gio/gapplicationimpl-dbus.c | |
| parent | 65bd1f526d86ce08d6fa4d7d6fc1140198c9aef1 (diff) | |
| parent | fabf506b8d5baf8f59fca563e6f1a62be5148112 (diff) | |
| download | glib-wip/gsettings-list.tar.gz | |
Merge branch 'master' into wip/gsettings-listwip/gsettings-list
Diffstat (limited to 'gio/gapplicationimpl-dbus.c')
| -rw-r--r-- | gio/gapplicationimpl-dbus.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/gio/gapplicationimpl-dbus.c b/gio/gapplicationimpl-dbus.c index c9f430657..406b8390d 100644 --- a/gio/gapplicationimpl-dbus.c +++ b/gio/gapplicationimpl-dbus.c @@ -328,6 +328,8 @@ g_application_impl_actions_method_call (GDBusConnection *connection, g_dbus_method_invocation_return_value (invocation, g_variant_builder_end (&builder)); + + g_strfreev (actions); } else if (strcmp (method_name, "SetState") == 0) @@ -666,7 +668,7 @@ g_application_impl_register (GApplication *application, g_free (impl->object_path); g_slice_free (GApplicationImpl, impl); - impl = NULL; + return NULL; } } @@ -674,7 +676,7 @@ g_application_impl_register (GApplication *application, * This also serves as a mechanism to ensure that the primary exists * (ie: DBus service files installed correctly, etc). */ - impl->signal_id = + impl->signal_id = g_dbus_connection_signal_subscribe (impl->session_bus, impl->bus_name, "org.gtk.Actions", NULL, impl->object_path, NULL, |