summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabiano FidĂȘncio <fidencio@redhat.com>2015-10-13 19:32:58 +0200
committerFabiano FidĂȘncio <fidencio@redhat.com>2015-12-15 15:08:36 +0100
commitfbd595df09e10837e5d04a423fbd682d44564722 (patch)
tree01b94d62aefcb451ead11f7c4efd8b76b2a41e5f
parent4ce98dd1d4fbe6af4d9b4938f416527f024ef9c7 (diff)
downloadvirt-viewer-fbd595df09e10837e5d04a423fbd682d44564722.tar.gz
virt-viewer-fbd595df09e10837e5d04a423fbd682d44564722.tar.xz
virt-viewer-fbd595df09e10837e5d04a423fbd682d44564722.zip
app: make _get_preferences() more readable
This commit is just making virt_viewer_app_get_preferences() more readable for when ssh-agent forward option gets added.
-rw-r--r--src/virt-viewer-app.c55
1 files changed, 27 insertions, 28 deletions
diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
index 653b30c..38691aa 100644
--- a/src/virt-viewer-app.c
+++ b/src/virt-viewer-app.c
@@ -2489,34 +2489,33 @@ virt_viewer_app_get_preferences(VirtViewerApp *self)
g_object_set (gtk_builder_get_object(builder, "fcsharefolder"),
"sensitive", can_share_folder, NULL);
- if (!can_share_folder)
- goto end;
-
- g_object_bind_property(virt_viewer_app_get_session(self),
- "share-folder",
- gtk_builder_get_object(builder, "cbsharefolder"),
- "active",
- G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
-
- g_object_bind_property(virt_viewer_app_get_session(self),
- "share-folder-ro",
- gtk_builder_get_object(builder, "cbsharefolderro"),
- "active",
- G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
-
- self->priv->preferences_shared_folder =
- GTK_FILE_CHOOSER(gtk_builder_get_object(builder, "fcsharefolder"));
-
- g_object_get(virt_viewer_app_get_session(self),
- "shared-folder", &path, NULL);
-
- gtk_file_chooser_set_filename(self->priv->preferences_shared_folder, path);
- g_free(path);
-
- virt_viewer_signal_connect_object(self->priv->preferences_shared_folder,
- "file-set",
- G_CALLBACK(share_folder_changed), self,
- G_CONNECT_SWAPPED);
+ if (can_share_folder) {
+ g_object_bind_property(virt_viewer_app_get_session(self),
+ "share-folder",
+ gtk_builder_get_object(builder, "cbsharefolder"),
+ "active",
+ G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
+
+ g_object_bind_property(virt_viewer_app_get_session(self),
+ "share-folder-ro",
+ gtk_builder_get_object(builder, "cbsharefolderro"),
+ "active",
+ G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
+
+ self->priv->preferences_shared_folder =
+ GTK_FILE_CHOOSER(gtk_builder_get_object(builder, "fcsharefolder"));
+
+ g_object_get(virt_viewer_app_get_session(self),
+ "shared-folder", &path, NULL);
+
+ gtk_file_chooser_set_filename(self->priv->preferences_shared_folder, path);
+ g_free(path);
+
+ virt_viewer_signal_connect_object(self->priv->preferences_shared_folder,
+ "file-set",
+ G_CALLBACK(share_folder_changed), self,
+ G_CONNECT_SWAPPED);
+ }
end:
g_object_unref(builder);