diff options
| author | Ali Abdallah <ali@xfce.org> | 2017-07-17 10:48:06 +0200 |
|---|---|---|
| committer | Ali Abdallah <ali@xfce.org> | 2017-07-17 10:48:06 +0200 |
| commit | bbe28a49c78156fe18676f04521aebe97b7f6ece (patch) | |
| tree | 5055a7282038175322d58bada0588187b7724758 /tumblerd | |
| parent | efab05835d148b7494f22f72ea8e030180136e48 (diff) | |
| download | tumbler-bbe28a49c78156fe18676f04521aebe97b7f6ece.tar.gz | |
Don't ref the variant before sending a signal and let it
be consumed by the gdbus signal emission.
Diffstat (limited to 'tumblerd')
| -rw-r--r-- | tumblerd/tumbler-service.c | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/tumblerd/tumbler-service.c b/tumblerd/tumbler-service.c index 929a125..7fa7c8c 100644 --- a/tumblerd/tumbler-service.c +++ b/tumblerd/tumbler-service.c @@ -393,11 +393,12 @@ tumbler_service_error_idle (gpointer user_data) g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE); /* signal variant */ - signal_variant = g_variant_ref_sink (g_variant_new ("(u^asis)", - info->handle, - info->uris, - info->error_code, - info->message)); + signal_variant = g_variant_new ("(u^asis)", + info->handle, + info->uris, + info->error_code, + info->message); + /* send the signal message over D-Bus */ g_dbus_connection_emit_signal (info->service->connection, info->origin, @@ -407,8 +408,6 @@ tumbler_service_error_idle (gpointer user_data) signal_variant, NULL); - g_variant_unref (signal_variant); - scheduler_idle_info_free (info); return FALSE; @@ -458,8 +457,9 @@ tumbler_service_finished_idle (gpointer user_data) g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE); g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE); - signal_variant = g_variant_ref_sink (g_variant_new ("(u)", - info->handle)); + signal_variant = g_variant_new ("(u)", + info->handle); + /* send the signal message over D-Bus */ g_dbus_connection_emit_signal (info->service->connection, info->origin, @@ -469,8 +469,6 @@ tumbler_service_finished_idle (gpointer user_data) signal_variant, NULL); - g_variant_unref (signal_variant); - /* allow the lifecycle manager to shut down the service again (unless there * are other requests still being processed) */ tumbler_component_decrement_use_count (TUMBLER_COMPONENT (info->service)); @@ -518,9 +516,9 @@ tumbler_service_ready_idle (gpointer user_data) g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE); g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE); - signal_variant = g_variant_ref_sink (g_variant_new ("(u^as)", - info->handle, - info->uris)); + signal_variant = g_variant_new ("(u^as)", + info->handle, + info->uris); /* send the signal message over D-Bus */ g_dbus_connection_emit_signal (info->service->connection, @@ -531,8 +529,6 @@ tumbler_service_ready_idle (gpointer user_data) signal_variant, NULL); - g_variant_unref (signal_variant); - scheduler_idle_info_free (info); return FALSE; @@ -578,8 +574,7 @@ tumbler_service_started_idle (gpointer user_data) g_return_val_if_fail (info->origin != NULL && *info->origin != '\0', FALSE); g_return_val_if_fail (TUMBLER_IS_SERVICE (info->service), FALSE); - signal_variant = g_variant_ref_sink (g_variant_new ("(u)", info->handle)); - + signal_variant = g_variant_new ("(u)", info->handle); /* send the signal message over D-Bus */ g_dbus_connection_emit_signal (info->service->connection, @@ -590,8 +585,6 @@ tumbler_service_started_idle (gpointer user_data) signal_variant, NULL); - g_variant_unref (signal_variant); - scheduler_idle_info_free (info); return FALSE; |