[gnome-initial-setup/wip/152-fix-domain-administrator-login-dialog: 1/4] DO NOT MERGE
- From: Will Thompson <wjt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-initial-setup/wip/152-fix-domain-administrator-login-dialog: 1/4] DO NOT MERGE
- Date: Tue, 6 Sep 2022 13:34:21 +0000 (UTC)
commit 1b77f0d929b2a28d6d69152c385a359ab03d3759
Author: Will Thompson <wjt endlessos org>
Date: Tue Sep 6 14:28:52 2022 +0100
DO NOT MERGE
gnome-initial-setup/gnome-initial-setup.c | 2 ++
gnome-initial-setup/pages/account/gis-account-page-enterprise.c | 5 +++++
2 files changed, 7 insertions(+)
---
diff --git a/gnome-initial-setup/gnome-initial-setup.c b/gnome-initial-setup/gnome-initial-setup.c
index 113ded36..6cdcd383 100644
--- a/gnome-initial-setup/gnome-initial-setup.c
+++ b/gnome-initial-setup/gnome-initial-setup.c
@@ -62,6 +62,7 @@ typedef struct {
#define PAGE(name, new_user_only) { #name, gis_prepare_ ## name ## _page, new_user_only }
static PageData page_table[] = {
+#if 0
PAGE (welcome, FALSE),
PAGE (language, FALSE),
PAGE (keyboard, FALSE),
@@ -70,6 +71,7 @@ static PageData page_table[] = {
PAGE (timezone, TRUE),
PAGE (software, TRUE),
PAGE (goa, FALSE),
+#endif
PAGE (account, TRUE),
PAGE (password, TRUE),
#ifdef HAVE_PARENTAL_CONTROLS
diff --git a/gnome-initial-setup/pages/account/gis-account-page-enterprise.c
b/gnome-initial-setup/pages/account/gis-account-page-enterprise.c
index 7b119950..79504a99 100644
--- a/gnome-initial-setup/pages/account/gis-account-page-enterprise.c
+++ b/gnome-initial-setup/pages/account/gis-account-page-enterprise.c
@@ -691,6 +691,11 @@ on_realmd_appeared (GDBusConnection *connection,
{
GisAccountPageEnterprise *page = user_data;
um_realm_manager_new (NULL, on_realm_manager_created, page);
+
+ gtk_window_set_transient_for (GTK_WINDOW (page->join_dialog),
+ GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (page))));
+ gtk_window_set_modal (GTK_WINDOW (page->join_dialog), TRUE);
+ gtk_window_present (GTK_WINDOW (page->join_dialog));
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]