applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sharing: Replace vino with gnome-remote-desktop for X11 sessions

Browse source 
vino does not work in Wayland sessions and gnome-settings-daemon
removed vino support in [1] which will effectively not start
'vino-server' any more.
The replacement for vino is gnome-remote-desktop since it works in both
Wayland and X11 sessions.
The gnome-remote-desktop sharing panel however is currently only shown
for Wayland sessions, which makes it harder to use it for X11 sessions
since the user has to login into the Wayland sessions just to be able
to enable gnome-remote-desktop.

Therefore, also remove vino from g-c-c and replace it with
gnome-remote-desktop for X11 sessions, too.

[1] https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/135

Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/212
Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/937
This commit is contained in:
Pascal Nowack 2020-06-16 10:48:23 +02:00
parent 031c311344
commit 2a25607e74
1 changed files with 2 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

77
panels/sharing/cc-sharing-panel.c
View file

@ -24,7 +24,6 @@
#include "list-box-helper.h"
#include "cc-sharing-resources.h"
#include "vino-preferences.h"
#include "cc-remote-login.h"
#include "file-share-properties.h"
#include "cc-media-sharing.h"
@ -43,7 +42,6 @@ static void cc_sharing_panel_setup_label_with_hostname (CcSharingPanel *self, Gt
static GtkWidget *cc_sharing_panel_new_media_sharing_row (const char *uri_or_path,
CcSharingPanel *self);
#define VINO_SCHEMA_ID "org.gnome.Vino"
#define FILE_SHARING_SCHEMA_ID "org.gnome.desktop.file-sharing"
#define GNOME_REMOTE_DESKTOP_SCHEMA_ID "org.gnome.desktop.remote-desktop"
#define GNOME_REMOTE_DESKTOP_VNC_SCHEMA_ID "org.gnome.desktop.remote-desktop.vnc"
@ -1006,67 +1004,6 @@ screen_sharing_password_insert_text_cb (CcSharingPanel *self,
}
#undef MAX_PASSWORD_SIZE
static void
cc_sharing_panel_setup_screen_sharing_dialog_vino (CcSharingPanel *self)
{
GSettings *settings;
GtkWidget *networks, *box, *w;
cc_sharing_panel_bind_switch_to_widgets (self->require_password_radiobutton,
self->password_grid,
NULL);
cc_sharing_panel_setup_label_with_hostname (self,
self->screen_sharing_label);
/* settings bindings */
settings = g_settings_new (VINO_SCHEMA_ID);
g_settings_bind (settings, "view-only", self->remote_control_checkbutton,
"active",
G_SETTINGS_BIND_DEFAULT | G_SETTINGS_BIND_INVERT_BOOLEAN);
g_settings_bind (settings, "prompt-enabled",
self->approve_connections_radiobutton, "active",
G_SETTINGS_BIND_DEFAULT);
g_settings_bind_with_mapping (settings, "authentication-methods",
self->require_password_radiobutton,
"active",
G_SETTINGS_BIND_DEFAULT,
vino_get_authtype, vino_set_authtype, NULL, NULL);
g_settings_bind_with_mapping (settings, "vnc-password",
self->remote_control_password_entry,
"text",
G_SETTINGS_BIND_DEFAULT,
vino_get_password, vino_set_password, NULL, NULL);
g_object_bind_property (self->show_password_checkbutton, "active",
self->remote_control_password_entry, "visibility",
G_BINDING_SYNC_CREATE);
/* make sure the password entry is hidden by default */
g_signal_connect_object (self->screen_sharing_dialog, "show",
G_CALLBACK (screen_sharing_show_cb), self, G_CONNECT_SWAPPED);
g_signal_connect_object (self->screen_sharing_dialog, "hide",
G_CALLBACK (screen_sharing_hide_cb), self, G_CONNECT_SWAPPED);
/* accept at most 8 bytes in password entry */
g_signal_connect_object (self->remote_control_password_entry, "insert-text",
G_CALLBACK (screen_sharing_password_insert_text_cb), self, G_CONNECT_SWAPPED);
networks = cc_sharing_networks_new (self->sharing_proxy, "vino-server");
box = self->remote_control_box;
gtk_box_pack_end (GTK_BOX (box), networks, TRUE, TRUE, 0);
gtk_widget_show (networks);
w = cc_sharing_switch_new (networks);
gtk_header_bar_pack_start (GTK_HEADER_BAR (self->screen_sharing_headerbar), w);
self->screen_sharing_switch = w;
cc_sharing_panel_bind_networks_to_label (self, networks,
self->screen_sharing_row);
}
static void
on_vnc_password_entry_notify_text (CcSharingPanel *self)
{
@ -1226,18 +1163,8 @@ sharing_proxy_ready (GObject *source,
cc_sharing_panel_setup_remote_login_dialog (self);
/* screen sharing */
#ifdef GDK_WINDOWING_WAYLAND
if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ()))
{
check_remote_desktop_available (self);
gtk_widget_hide (self->screen_sharing_row);
}
else
#endif
if (cc_sharing_panel_check_schema_available (self, VINO_SCHEMA_ID))
cc_sharing_panel_setup_screen_sharing_dialog_vino (self);
else
gtk_widget_hide (self->screen_sharing_row);
check_remote_desktop_available (self);
gtk_widget_hide (self->screen_sharing_row);
}
static void