← Back to branch summary

~ubuntu-branches/ubuntu/vivid/mir/vivid

« back to all changes in this revision

Viewing changes to tests/integration-tests/client/test_client_render.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release
  • Date: 2014-10-10 14:01:26 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20141010140126-n1czko8na1kuz4ll
Tags: upstream-0.8.0+14.10.20141010
Import upstream version 0.8.0+14.10.20141010

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration-tests/client/test_client_render.cpp
114
114
        }
115
115
 
116
116
        mir_surface_release_sync(surface);
117
 
        // Clear the lifecycle callback in order not to get SIGTERM by the default
118
 
        // lifecycle handler during connection teardown
 
117
        // Clear the lifecycle callback in order not to get SIGHUP by the
 
118
        // default lifecycle handler during connection teardown
119
119
        mir_connection_set_lifecycle_event_callback(connection, null_lifecycle_callback, nullptr);
120
120
        mir_connection_release(connection);
121
121
        return 0;
174
174
        }
175
175
 
176
176
        mir_surface_release_sync(mir_surface);
177
 
        // Clear the lifecycle callback in order not to get SIGTERM by the default
178
 
        // lifecycle handler during connection teardown
 
177
        // Clear the lifecycle callback in order not to get SIGHUP by the
 
178
        // default lifecycle handler during connection teardown
179
179
        mir_connection_set_lifecycle_event_callback(connection, null_lifecycle_callback, nullptr);
180
180
        mir_connection_release(connection);
181
181
        return 0;