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

user-accounts: Move realm model into .ui file

Browse source
This commit is contained in:
Robert Ancell 2018-11-07 14:10:42 +13:00
parent 550cbc2367
commit 1691cd74fc
2 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -72,6 +72,7 @@ struct _CcAddUserDialog {
GtkLabel *enterprise_hint; GtkLabel *enterprise_hint;
GtkEntry *enterprise_login; GtkEntry *enterprise_login;
GtkEntry *enterprise_password; GtkEntry *enterprise_password;
GtkListStore *enterprise_realms;
GtkLabel *local_hint; GtkLabel *local_hint;
GtkEntry *local_name; GtkEntry *local_name;
GtkRadioButton *local_password_radio; GtkRadioButton *local_password_radio;
@ -97,7 +98,6 @@ struct _CcAddUserDialog {
gint local_password_timeout_id; gint local_password_timeout_id;
guint realmd_watch; guint realmd_watch;
GtkListStore *enterprise_realms;
UmRealmManager *realm_manager; UmRealmManager *realm_manager;
UmRealmObject *selected_realm; UmRealmObject *selected_realm;
gboolean enterprise_check_credentials; gboolean enterprise_check_credentials;
@ -1336,13 +1336,10 @@ enterprise_init (CcAddUserDialog *self)
{ {
GNetworkMonitor *monitor; GNetworkMonitor *monitor;
self->enterprise_realms = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_OBJECT);
self->enterprise_check_credentials = FALSE; self->enterprise_check_credentials = FALSE;
g_signal_connect (self->enterprise_domain, "changed", G_CALLBACK (on_domain_changed), self); g_signal_connect (self->enterprise_domain, "changed", G_CALLBACK (on_domain_changed), self);
g_signal_connect_after (self->enterprise_domain, "focus-out-event", G_CALLBACK (on_enterprise_domain_focus_out), self); g_signal_connect_after (self->enterprise_domain, "focus-out-event", G_CALLBACK (on_enterprise_domain_focus_out), self);
gtk_combo_box_set_model (GTK_COMBO_BOX (self->enterprise_domain),
GTK_TREE_MODEL (self->enterprise_realms));
enterprise_check_domain (self); enterprise_check_domain (self);
g_signal_connect (self->enterprise_login, "changed", G_CALLBACK (on_entry_changed), self); g_signal_connect (self->enterprise_login, "changed", G_CALLBACK (on_entry_changed), self);
@ -1550,7 +1547,6 @@ cc_add_user_dialog_finalize (GObject *obj)
if (self->cancellable) if (self->cancellable)
g_object_unref (self->cancellable); g_object_unref (self->cancellable);
g_clear_object (&self->permission); g_clear_object (&self->permission);
g_object_unref (self->enterprise_realms);
G_OBJECT_CLASS (cc_add_user_dialog_parent_class)->finalize (obj); G_OBJECT_CLASS (cc_add_user_dialog_parent_class)->finalize (obj);
} }
@ -1578,6 +1574,7 @@ cc_add_user_dialog_class_init (CcAddUserDialogClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, enterprise_hint); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, enterprise_hint);
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, enterprise_login); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, enterprise_login);
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, enterprise_password); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, enterprise_password);
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, enterprise_realms);
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, local_hint); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, local_hint);
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, local_name); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, local_name);
gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, local_password_radio); gtk_widget_class_bind_template_child (widget_class, CcAddUserDialog, local_password_radio);

9
panels/user-accounts/cc-add-user-dialog.ui
View file

@ -571,6 +571,7 @@
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="has_entry">True</property> <property name="has_entry">True</property>
<property name="entry_text_column">0</property> <property name="entry_text_column">0</property>
<property name="model">enterprise_realms</property>
<child internal-child="entry"> <child internal-child="entry">
<object class="GtkEntry" id="enterprise_domain_entry"> <object class="GtkEntry" id="enterprise_domain_entry">
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -827,4 +828,12 @@
<widget name="button2"/> <widget name="button2"/>
</widgets> </widgets>
</object> </object>
<object class="GtkListStore" id="enterprise_realms">
<columns>
<!-- column-name title -->
<column type="gchararray"/>
<!-- column-name realm -->
<column type="GObject"/>
</columns>
</object>
</interface> </interface>