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

user-accounts: Consolidate now simpler init functions

Browse source
This commit is contained in:
Robert Ancell 2018-11-07 14:21:49 +13:00
parent 043b6dc907
commit 74cf3bcda1
1 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

41
panels/user-accounts/cc-add-user-dialog.c
View file

@ -549,14 +549,6 @@ local_password_radio_changed_cb (CcAddUserDialog *self)
dialog_validate (self);
}
static void
local_init (CcAddUserDialog *self)
{
self->local_password_mode = ACT_USER_PASSWORD_MODE_SET_AT_LOGIN;
dialog_validate (self);
update_password_strength (self);
}
static void
local_prepare (CcAddUserDialog *self)
{
@ -1286,21 +1278,6 @@ enterprise_password_changed_cb (CcAddUserDialog *self)
clear_entry_validation_error (self->enterprise_password);
}
static void
enterprise_init (CcAddUserDialog *self)
{
GNetworkMonitor *monitor;
enterprise_check_domain (self);
self->realmd_watch = g_bus_watch_name (G_BUS_TYPE_SYSTEM, "org.freedesktop.realmd",
G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
on_realmd_appeared, on_realmd_disappeared,
self, NULL);
monitor = g_network_monitor_get_default ();
g_signal_connect_object (monitor, "network-changed", G_CALLBACK (on_network_changed), self, 0);
}
static void
enterprise_prepare (CcAddUserDialog *self)
{
@ -1364,10 +1341,24 @@ enterprise_button_toggled_cb (CcAddUserDialog *self)
static void
cc_add_user_dialog_init (CcAddUserDialog *self)
{
GNetworkMonitor *monitor;
gtk_widget_init_template (GTK_WIDGET (self));
local_init (self);
enterprise_init (self);
self->local_password_mode = ACT_USER_PASSWORD_MODE_SET_AT_LOGIN;
dialog_validate (self);
update_password_strength (self);
enterprise_check_domain (self);
self->realmd_watch = g_bus_watch_name (G_BUS_TYPE_SYSTEM, "org.freedesktop.realmd",
G_BUS_NAME_WATCHER_FLAGS_AUTO_START,
on_realmd_appeared, on_realmd_disappeared,
self, NULL);
monitor = g_network_monitor_get_default ();
g_signal_connect_object (monitor, "network-changed", G_CALLBACK (on_network_changed), self, 0);
join_init (self);
}