summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Grunt <pgrunt@redhat.com>2016-03-17 11:19:32 +0100
committerPavel Grunt <pgrunt@redhat.com>2016-03-18 11:42:08 +0100
commitfdeef8e6ddee74190346c640a02d259981b33c8a (patch)
tree721ee73474a0c82f3f8616ba0eaf917b5d317c95
parent923d74b5a7949cff6a4c46512091ed6e530618cb (diff)
downloadspice-gtk-fdeef8e6ddee74190346c640a02d259981b33c8a.tar.gz
spice-gtk-fdeef8e6ddee74190346c640a02d259981b33c8a.tar.xz
spice-gtk-fdeef8e6ddee74190346c640a02d259981b33c8a.zip
usb-acl-helper: Remove extra check for NULL
g_cancellable_cancel() and g_clear_object() can handle it Acked-by: Victor Toso <victortoso@redhat.com>
-rw-r--r--src/spice-client-glib-usb-acl-helper.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/spice-client-glib-usb-acl-helper.c b/src/spice-client-glib-usb-acl-helper.c
index 3c5de05..20d1558 100644
--- a/src/spice-client-glib-usb-acl-helper.c
+++ b/src/spice-client-glib-usb-acl-helper.c
@@ -150,8 +150,7 @@ out:
static void cleanup(void)
{
- if (polkit_cancellable)
- g_cancellable_cancel(polkit_cancellable);
+ g_cancellable_cancel(polkit_cancellable);
if (state == STATE_WAITING_FOR_STDIN_EOF)
set_facl(path, getuid(), 0);
@@ -361,8 +360,7 @@ int main(void)
g_main_loop_run(loop);
- if (polkit_cancellable)
- g_clear_object(&polkit_cancellable);
+ g_clear_object(&polkit_cancellable);
g_object_unref(stdin_stream);
g_object_unref(authority);
g_object_unref(subject);