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

system, secure-shell: Rename internal name from RemoteLogin

Browse source 
As the user facing name of this setting changed to "Secure Shell",
let's change its internal name to match it.

This avoids confusion with the Remote Desktop "Remote Session" setting,
which is now named "Remote Login" in the UI and should get its code
renamed to follow that consistently.
This commit is contained in:
Felipe Borges 2024-03-21 11:03:52 +01:00
parent 96cf88c68f
commit 9a05b542e2
12 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
panels/system/cc-system-panel.c
View file

@ -31,7 +31,7 @@
#include "datetime/cc-datetime-page.h"
#include "region/cc-region-page.h"
#include "remote-desktop/cc-remote-desktop-page.h"
#include "remote-login/cc-remote-login-page.h"
#include "secure-shell/cc-secure-shell-page.h"
#include "users/cc-users-page.h"
struct _CcSystemPanel
@ -125,7 +125,7 @@ on_secure_shell_row_clicked (CcSystemPanel *self)
if (self->remote_login_dialog == NULL) {
GtkWidget *parent = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self)));
self->remote_login_dialog = g_object_new (CC_TYPE_REMOTE_LOGIN_PAGE, NULL);
self->remote_login_dialog = g_object_new (CC_TYPE_SECURE_SHELL_PAGE, NULL);
gtk_window_set_transient_for (GTK_WINDOW (self->remote_login_dialog),
GTK_WINDOW (parent));
@ -211,7 +211,7 @@ cc_system_panel_class_init (CcSystemPanelClass *klass)
g_type_ensure (CC_TYPE_DATE_TIME_PAGE);
g_type_ensure (CC_TYPE_REGION_PAGE);
g_type_ensure (CC_TYPE_REMOTE_DESKTOP_PAGE);
g_type_ensure (CC_TYPE_REMOTE_LOGIN_PAGE);
g_type_ensure (CC_TYPE_SECURE_SHELL_PAGE);
g_type_ensure (CC_TYPE_USERS_PAGE);
}

8
panels/system/meson.build
View file

@ -46,9 +46,9 @@ sources = files(
'remote-desktop/cc-remote-session-page.c',
'remote-desktop/cc-tls-certificate.c',
'remote-desktop/cc-systemd-service.c',
'remote-login/cc-remote-login.c',
'remote-login/cc-remote-login-page.c',
'remote-login/cc-systemd-service.c',
'secure-shell/cc-secure-shell.c',
'secure-shell/cc-secure-shell-page.c',
'secure-shell/cc-systemd-service.c',
'users/cc-add-user-dialog.c',
'users/cc-avatar-chooser.c',
'users/cc-crop-area.c',
@ -151,7 +151,7 @@ subdir('about')
subdir('datetime')
subdir('region')
subdir('remote-desktop')
subdir('remote-login')
subdir('secure-shell')
subdir('users')
panels_libs += static_library(

46
panels/system/remote-login/cc-remote-login-page.c → panels/system/secure-shell/cc-secure-shell-page.c
View file

@ -18,34 +18,34 @@
*/
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "cc-remote-login-page"
#define G_LOG_DOMAIN "cc-secure-shell-page"
#include <glib/gi18n.h>
#include "cc-hostname.h"
#include "cc-list-row.h"
#include "cc-remote-login.h"
#include "cc-remote-login-page.h"
#include "cc-secure-shell.h"
#include "cc-secure-shell-page.h"
#include "cc-systemd-service.h"
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
struct _CcRemoteLoginPage {
struct _CcSecureShellPage {
AdwWindow parent_instance;
AdwActionRow *hostname_row;
AdwSwitchRow *remote_login_row;
AdwSwitchRow *secure_shell_row;
AdwToastOverlay *toast_overlay;
GCancellable *cancellable;
};
G_DEFINE_TYPE (CcRemoteLoginPage, cc_remote_login_page, ADW_TYPE_WINDOW)
G_DEFINE_TYPE (CcSecureShellPage, cc_secure_shell_page, ADW_TYPE_WINDOW)
static void
on_copy_ssh_command_button_clicked (CcRemoteLoginPage *self)
on_copy_ssh_command_button_clicked (CcSecureShellPage *self)
{
gdk_clipboard_set_text (gtk_widget_get_clipboard (GTK_WIDGET (self)),
adw_action_row_get_subtitle (ADW_ACTION_ROW (self->hostname_row)));
@ -54,42 +54,42 @@ on_copy_ssh_command_button_clicked (CcRemoteLoginPage *self)
}
static void
remote_login_row_activate (CcRemoteLoginPage *self)
secure_shell_row_activate (CcSecureShellPage *self)
{
cc_remote_login_set_enabled (self->cancellable, self->remote_login_row);
cc_secure_shell_set_enabled (self->cancellable, self->secure_shell_row);
}
static void
cc_remote_login_page_dispose (GObject *object)
cc_secure_shell_page_dispose (GObject *object)
{
CcRemoteLoginPage *self = (CcRemoteLoginPage *) object;
CcSecureShellPage *self = (CcSecureShellPage *) object;
g_cancellable_cancel (self->cancellable);
g_clear_object (&self->cancellable);
G_OBJECT_CLASS (cc_remote_login_page_parent_class)->dispose (object);
G_OBJECT_CLASS (cc_secure_shell_page_parent_class)->dispose (object);
}
static void
cc_remote_login_page_class_init (CcRemoteLoginPageClass * klass)
cc_secure_shell_page_class_init (CcSecureShellPageClass * klass)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->dispose = cc_remote_login_page_dispose;
object_class->dispose = cc_secure_shell_page_dispose;
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/system/remote-login/cc-remote-login-page.ui");
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/system/secure-shell/cc-secure-shell-page.ui");
gtk_widget_class_bind_template_child (widget_class, CcRemoteLoginPage, hostname_row);
gtk_widget_class_bind_template_child (widget_class, CcRemoteLoginPage, remote_login_row);
gtk_widget_class_bind_template_child (widget_class, CcRemoteLoginPage, toast_overlay);
gtk_widget_class_bind_template_child (widget_class, CcSecureShellPage, hostname_row);
gtk_widget_class_bind_template_child (widget_class, CcSecureShellPage, secure_shell_row);
gtk_widget_class_bind_template_child (widget_class, CcSecureShellPage, toast_overlay);
gtk_widget_class_bind_template_callback (widget_class, on_copy_ssh_command_button_clicked);
gtk_widget_class_bind_template_callback (widget_class, remote_login_row_activate);
gtk_widget_class_bind_template_callback (widget_class, secure_shell_row_activate);
}
static void
cc_remote_login_page_init (CcRemoteLoginPage *self)
cc_secure_shell_page_init (CcSecureShellPage *self)
{
g_autofree gchar *hostname = NULL;
g_autofree gchar *command = NULL;
@ -98,10 +98,10 @@ cc_remote_login_page_init (CcRemoteLoginPage *self)
self->cancellable = g_cancellable_new ();
cc_remote_login_get_enabled (self->remote_login_row);
g_signal_connect_object (self->remote_login_row,
cc_secure_shell_get_enabled (self->secure_shell_row);
g_signal_connect_object (self->secure_shell_row,
"notify::active",
G_CALLBACK (remote_login_row_activate),
G_CALLBACK (secure_shell_row_activate),
self,
G_CONNECT_SWAPPED);

4
panels/system/remote-login/cc-remote-login-page.h → panels/system/secure-shell/cc-secure-shell-page.h
View file

@ -23,8 +23,8 @@
G_BEGIN_DECLS
#define CC_TYPE_REMOTE_LOGIN_PAGE (cc_remote_login_page_get_type ())
#define CC_TYPE_SECURE_SHELL_PAGE (cc_secure_shell_page_get_type ())
G_DECLARE_FINAL_TYPE (CcRemoteLoginPage, cc_remote_login_page, CC, CC_TYPE_REMOTE_LOGIN_PAGE, AdwWindow)
G_DECLARE_FINAL_TYPE (CcSecureShellPage, cc_secure_shell_page, CC, CC_TYPE_SECURE_SHELL_PAGE, AdwWindow)
G_END_DECLS

6
panels/system/remote-login/cc-remote-login-page.ui → panels/system/secure-shell/cc-secure-shell-page.ui
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<template class="CcRemoteLoginPage" parent="AdwWindow">
<template class="CcSecureShellPage" parent="AdwWindow">
<property name="title" translatable="yes">Secure Shell</property>
<property name="hide-on-close">True</property>
<property name="resizable">False</property>
@ -47,7 +47,7 @@
<child>
<object class="AdwPreferencesGroup">
<child>
<object class="AdwSwitchRow" id="remote_login_row">
<object class="AdwSwitchRow" id="secure_shell_row">
<property name="title" translatable="yes">_Secure Shell</property>
<property name="use-underline">True</property>
<property name="sensitive">False</property>
@ -66,7 +66,7 @@
<property name="valign">center</property>
<property name="tooltip-text" translatable="yes">Copy</property>
<property name="icon-name">edit-copy-symbolic</property>
<signal name="clicked" handler="on_copy_ssh_command_button_clicked" object="CcRemoteLoginPage" swapped="yes"/>
<signal name="clicked" handler="on_copy_ssh_command_button_clicked" object="CcSecureShellPage" swapped="yes"/>
<style>
<class name="flat"/>
</style>

8
panels/system/remote-login/cc-remote-login.c → panels/system/secure-shell/cc-secure-shell.c
View file

@ -18,7 +18,7 @@
* Author: Thomas Wood <thomas.wood@intel.com>
*
*/
#include "cc-remote-login.h"
#include "cc-secure-shell.h"
#include "cc-systemd-service.h"
#include <gio/gio.h>
@ -38,7 +38,7 @@ typedef struct
G_DEFINE_AUTOPTR_CLEANUP_FUNC (CallbackData, g_free)
void
cc_remote_login_get_enabled (AdwSwitchRow *widget)
cc_secure_shell_get_enabled (AdwSwitchRow *widget)
{
/* disable the switch until the current state is known */
gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE);
@ -96,11 +96,11 @@ on_permission_acquired (GObject *source_object,
/* If permission could not be acquired, or permission was not granted,
* switch might be out of sync, update switch state */
cc_remote_login_get_enabled (callback_data->widget);
cc_secure_shell_get_enabled (callback_data->widget);
}
void
cc_remote_login_set_enabled (GCancellable *cancellable,
cc_secure_shell_set_enabled (GCancellable *cancellable,
AdwSwitchRow *widget)
{
GPermission *permission;

4
panels/system/remote-login/cc-remote-login.h → panels/system/secure-shell/cc-secure-shell.h
View file

@ -23,6 +23,6 @@
#include <adwaita.h>
void cc_remote_login_get_enabled (AdwSwitchRow *widget);
void cc_remote_login_set_enabled (GCancellable *cancellable,
void cc_secure_shell_get_enabled (AdwSwitchRow *widget);
void cc_secure_shell_set_enabled (GCancellable *cancellable,
AdwSwitchRow *row);

0
panels/system/remote-login/cc-systemd-service.c → panels/system/secure-shell/cc-systemd-service.c
View file

0
panels/system/remote-login/cc-systemd-service.h → panels/system/secure-shell/cc-systemd-service.h
View file

0
panels/system/remote-login/meson.build → panels/system/secure-shell/meson.build
View file

0
panels/system/remote-login/org.gnome.controlcenter.remote-login-helper.policy.in.in → panels/system/secure-shell/org.gnome.controlcenter.remote-login-helper.policy.in.in
View file

2
panels/system/system.gresource.xml
View file

@ -18,7 +18,7 @@
<file preprocess="xml-stripblanks">remote-desktop/cc-remote-session-page.ui</file>
<file preprocess="xml-stripblanks">remote-desktop/cc-desktop-sharing-page.ui</file>
<file>remote-desktop/remote-desktop.css</file>
<file preprocess="xml-stripblanks">remote-login/cc-remote-login-page.ui</file>
<file preprocess="xml-stripblanks">secure-shell/cc-secure-shell-page.ui</file>
<file preprocess="xml-stripblanks">users/cc-add-user-dialog.ui</file>
<file preprocess="xml-stripblanks">users/cc-avatar-chooser.ui</file>
<file preprocess="xml-stripblanks">users/cc-entry-feedback.ui</file>