Merge lp:~bregma/grail/lp-1537161 into lp:grail

[Stephen M. Webb]

put braces around a test case to fix a FTBFS using GCC-6

Puts braces around an else-clause in a test case that was lacking them.

Fixes a FTBFS with GCC-6.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:257
http://jenkins.qa.ubuntu.com/job/grail-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/grail-wily-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/grail-wily-armhf-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/grail-wily-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/grail-ci/1/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

This is now correct.

review: Approve

=== modified file 'tools/grail-test-atomic.c'
--- tools/grail-test-atomic.c	2012-12-04 11:32:11 +0000
+++ tools/grail-test-atomic.c	2016-01-22 21:58:03 +0000
@@ -143,15 +143,16 @@
         print_device_added(frame_handle, event);
         status = frame_event_get_property(event, UFEventPropertyDevice,
                                           &device);
-        if (status != UFStatusSuccess)
+        if (status != UFStatusSuccess) {
           fprintf(stderr, "Error: failed to get device from event\n");
-        else
+        } else {
           subscribe(grail_handle, device, subscribe_window, subscriptions, 2,
                     2);
           subscribe(grail_handle, device, subscribe_window, subscriptions, 3,
                     1);
           subscribe(grail_handle, device, subscribe_window, subscriptions, 4,
                     1);
+        }
         break;
       }