pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-28 15:20:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

virt-viewer-app: Add a GError arg to create_session()

Browse Source 
This is part of a small re-factoring that will have all connection
errors, when we won't be able to connect regardless of what changes on
the remote host, being treated by virt_viewer_app_initial_connect(),
avoiding weird behaviors as we have nowadays (like more than one error
dialog being shown or having the virt-viewer waiting forever for a guest
that will never show up).

Related: rhbz#1085216
This commit is contained in:
Fabiano Fidêncio 2015-03-26 23:05:31 +01:00
parent cab8f7450b
commit f9c4a03bd7
4 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/remote-viewer.c
View File

@ -950,11 +950,9 @@ create_ovirt_session(VirtViewerApp *app, const char *uri, GError **err)
virt_viewer_app_set_connect_info(app, NULL, ghost, gport, gtlsport,
session_type, NULL, NULL, 0, NULL);
if (virt_viewer_app_create_session(app, session_type) < 0) {
g_set_error(&error, VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED,
_("Failed to create a session type %s"), session_type);
if (virt_viewer_app_create_session(app, session_type, &error) < 0)
goto error;
}
#ifdef HAVE_SPICE_GTK
if (type == OVIRT_VM_DISPLAY_SPICE) {
SpiceSession *session;
@ -1223,7 +1221,7 @@ remote_viewer_start(VirtViewerApp *app, GError **err)
g_signal_connect(app, "notify", G_CALLBACK(app_notified), self);
if (priv->controller) {
if (virt_viewer_app_create_session(app, "spice") < 0) {
if (virt_viewer_app_create_session(app, "spice", &error) < 0) {
virt_viewer_app_simple_message_dialog(app, _("Couldn't create a Spice session"));
goto cleanup;
}
@ -1285,12 +1283,8 @@ retry_dialog:
} else
#endif
{
if (virt_viewer_app_create_session(app, type) < 0) {
g_set_error(&error,
VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED,
_("Couldn't create a session for this type: %s"), type);
if (virt_viewer_app_create_session(app, type, &error) < 0)
goto cleanup;
}
}
virt_viewer_session_set_file(virt_viewer_app_get_session(app), vvfile);

6
src/virt-viewer-app.c
View File

@ -1052,7 +1052,7 @@ static void notify_software_reader_cb(GObject *gobject G_GNUC_UNUSED,
}
int
virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type)
virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type, GError **error)
{
g_return_val_if_fail(VIRT_VIEWER_IS_APP(self), -1);
VirtViewerAppPrivate *priv = self->priv;
@ -1076,6 +1076,10 @@ virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type)
} else
#endif
{
g_set_error(error,
VIRT_VIEWER_ERROR, VIRT_VIEWER_ERROR_FAILED,
_("Unsupported graphic type '%s'"), type);
virt_viewer_app_trace(self, "Guest %s has unsupported %s display type",
priv->guest_name, type);
virt_viewer_app_simple_message_dialog(self, _("Unknown graphic type for the guest %s"),

2
src/virt-viewer-app.h
View File

@ -68,7 +68,7 @@ void virt_viewer_app_trace(VirtViewerApp *self, const char *fmt, ...);
void virt_viewer_app_simple_message_dialog(VirtViewerApp *self, const char *fmt, ...);
gboolean virt_viewer_app_is_active(VirtViewerApp *app);
void virt_viewer_app_free_connect_info(VirtViewerApp *self);
int virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type);
int virt_viewer_app_create_session(VirtViewerApp *self, const gchar *type, GError **error);
gboolean virt_viewer_app_activate(VirtViewerApp *self, GError **error);
gboolean virt_viewer_app_initial_connect(VirtViewerApp *self, GError **error);
void virt_viewer_app_set_zoom_level(VirtViewerApp *self, gint zoom_level);

2
src/virt-viewer.c
View File

@ -420,7 +420,7 @@ virt_viewer_extract_connect_info(VirtViewer *self,
goto cleanup;
}
if (virt_viewer_app_create_session(app, type) < 0)
if (virt_viewer_app_create_session(app, type, error) < 0)
goto cleanup;
xpath = g_strdup_printf("string(/domain/devices/graphics[@type='%s']/@port)", type);