shaba/virt-viewer
1
0
Fork 0
mirror of https://gitlab.com/virt-viewer/virt-viewer.git synced 2025-01-24 02:03:56 +03:00
Code Issues Projects Releases Wiki Activity

remote-viewer: learn to connect from file

Browse Source 
v2:
- move some variables to inner-block as requested by reviewer
This commit is contained in:
Marc-André Lureau 2012-11-23 01:14:22 +01:00
parent c218d43b48
commit 09b9add92f
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/remote-viewer.c
View File

@ -35,6 +35,7 @@
#include "virt-viewer-session-spice.h" #include "virt-viewer-session-spice.h"
#endif #endif
#include "virt-viewer-app.h" #include "virt-viewer-app.h"
#include "virt-viewer-file.h"
#include "remote-viewer.h" #include "remote-viewer.h"
#ifndef G_VALUE_INIT /* see bug https://bugzilla.gnome.org/show_bug.cgi?id=654793 */ #ifndef G_VALUE_INIT /* see bug https://bugzilla.gnome.org/show_bug.cgi?id=654793 */
@ -626,6 +627,8 @@ remote_viewer_start(VirtViewerApp *app)
RemoteViewer *self = REMOTE_VIEWER(app); RemoteViewer *self = REMOTE_VIEWER(app);
RemoteViewerPrivate *priv = self->priv; RemoteViewerPrivate *priv = self->priv;
#endif #endif
GFile *file = NULL;
VirtViewerFile *vvfile = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
gchar *guri = NULL; gchar *guri = NULL;
gchar *type = NULL; gchar *type = NULL;
@ -659,7 +662,20 @@ remote_viewer_start(VirtViewerApp *app)
if (virt_viewer_app_get_title(app) == NULL) if (virt_viewer_app_get_title(app) == NULL)
virt_viewer_app_set_title(app, guri); virt_viewer_app_set_title(app, guri);
if (virt_viewer_util_extract_host(guri, &type, NULL, NULL, NULL, NULL) < 0 || type == NULL) { file = g_file_new_for_commandline_arg(guri);
if (g_file_query_exists(file, NULL)) {
GError *error = NULL;
gchar *path = g_file_get_path(file);
vvfile = virt_viewer_file_new(path, &error);
g_free(path);
if (error) {
virt_viewer_app_simple_message_dialog(app, _("Invalid file %s"), guri);
g_warning(error->message);
g_clear_error(&error);
goto cleanup;
}
g_object_get(G_OBJECT(vvfile), "type", &type, NULL);
} else if (virt_viewer_util_extract_host(guri, &type, NULL, NULL, NULL, NULL) < 0 || type == NULL) {
virt_viewer_app_simple_message_dialog(app, _("Cannot determine the connection type from URI")); virt_viewer_app_simple_message_dialog(app, _("Cannot determine the connection type from URI"));
goto cleanup; goto cleanup;
} }
@ -669,6 +685,8 @@ remote_viewer_start(VirtViewerApp *app)
goto cleanup; goto cleanup;
} }
virt_viewer_session_set_file(virt_viewer_app_get_session(app), vvfile);
if (virt_viewer_app_initial_connect(app) < 0) { if (virt_viewer_app_initial_connect(app) < 0) {
virt_viewer_app_simple_message_dialog(app, _("Failed to initiate connection")); virt_viewer_app_simple_message_dialog(app, _("Failed to initiate connection"));
goto cleanup; goto cleanup;
@ -679,7 +697,9 @@ remote_viewer_start(VirtViewerApp *app)
ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->start(app); ret = VIRT_VIEWER_APP_CLASS(remote_viewer_parent_class)->start(app);
cleanup: cleanup:
g_clear_object(&file);
g_clear_object(&vvfile);
g_free(guri); g_free(guri);
g_free(type); g_free(type);
return ret; return ret;