diff options
| author | Pavel Grunt <pgrunt@redhat.com> | 2015-03-18 17:49:38 +0100 |
|---|---|---|
| committer | Fabiano Fidêncio <fidencio@redhat.com> | 2015-03-23 19:32:02 +0100 |
| commit | 1bcd8d0fe6df553f087d11b539a59e128a2a350b (patch) | |
| tree | 6198cf3b2846ce059fd6a0e5a6434894e8d7a544 /src/remote-viewer-main.c | |
| parent | aec2248cf86cacfc8950f48ccf0fc8fcaa261908 (diff) | |
| download | virt-viewer-1bcd8d0fe6df553f087d11b539a59e128a2a350b.tar.gz virt-viewer-1bcd8d0fe6df553f087d11b539a59e128a2a350b.tar.xz virt-viewer-1bcd8d0fe6df553f087d11b539a59e128a2a350b.zip | |
Exit normally when canceling dialog
This applies for:
libvirt authentication dialog (e.g. virt-viewer --attach guest)
'recent connection' dialog (e.g. remote-viewer)
'vm choose' dialog when connecting without specifying the vm name
This is done by using a new GError VIRT_VIEWER_ERROR_CANCELLED.
Diffstat (limited to 'src/remote-viewer-main.c')
| -rw-r--r-- | src/remote-viewer-main.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/remote-viewer-main.c b/src/remote-viewer-main.c index e8784ba..b3bb053 100644 --- a/src/remote-viewer-main.c +++ b/src/remote-viewer-main.c @@ -174,8 +174,12 @@ main(int argc, char **argv) app = VIRT_VIEWER_APP(viewer); - if (!virt_viewer_app_start(app)) + if (!virt_viewer_app_start(app, &error)) { + if (g_error_matches(error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_CANCELLED)) + ret = 0; + g_clear_error(&error); goto cleanup; + } g_signal_connect(virt_viewer_app_get_session(app), "session-connected", G_CALLBACK(connected), app); |