rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Accepting request 50675 from GNOME:Factory

Browse Source 
checked in (request 50675)

OBS-URL: https://build.opensuse.org/request/show/50675
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=146
This commit is contained in:
OBS User autobuild
2010-10-15 14:46:23 +00:00
committed by Git OBS Bridge
parent 8125b3f0ca
commit bd8d241a76
8 changed files with 78 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gdm-domain-logon.patch
View File

@@ -1803,7 +1803,7 @@ Index: gdm-2.29.5/gui/simple-greeter/gdm-greeter-panel.c
panel->priv->geometry.width = -1;
panel->priv->geometry.height = -1;
+ if (!gdm_settings_client_get_boolean (GDM_KEY_SUSE_SHOW_DOMAIN,
+ if (!gdm_settings_client_get_boolean (GDM_KEY_SHOW_DOMAIN,
+ &panel->priv->show_domain)) {
+ panel->priv->show_domain = FALSE;
+ }
@@ -2170,7 +2170,7 @@ Index: gdm-2.29.5/common/gdm-settings-keys.h
#define GDM_KEY_DEBUG "debug/Enable"
+#define GDM_KEY_SUSE_SHOW_DOMAIN "greeter/SUSEShowDomain"
+#define GDM_KEY_SHOW_DOMAIN "greeter/ShowDomain"
#define GDM_KEY_INCLUDE "greeter/Include"
#define GDM_KEY_EXCLUDE "greeter/Exclude"
#define GDM_KEY_INCLUDE_ALL "greeter/IncludeAll"
@@ -2179,10 +2179,10 @@ Index: gdm-2.29.5/common/gdm-settings-system-backend.c
--- gdm-2.29.5.orig/common/gdm-settings-system-backend.c
+++ gdm-2.29.5/common/gdm-settings-system-backend.c
@@ -44,11 +44,11 @@
#define SYSCONFIG_AUTOLOGIN_KEY "DISPLAYMANAGER_AUTOLOGIN"
#define SYSCONFIG_TCP_OPEN_KEY "DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN"
#define SYSCONFIG_XDMCP_KEY "DISPLAYMANAGER_REMOTE_ACCESS"
+#define SYSCONFIG_AD_KEY "DISPLAYMANAGER_AD_INTEGRATION"
#define SYSCONFIG_AUTOLOGIN_KEY "DISPLAYMANAGER_AUTOLOGIN"
#define SYSCONFIG_TCP_OPEN_KEY "DISPLAYMANAGER_XSERVER_TCP_PORT_6000_OPEN"
#define SYSCONFIG_XDMCP_KEY "DISPLAYMANAGER_REMOTE_ACCESS"
+#define SYSCONFIG_AD_KEY "DISPLAYMANAGER_AD_INTEGRATION"
/* Keys from sysconfig that have no equivalent in GDM:
* - DISPLAYMANAGER_ROOT_LOGIN_REMOTE
* - DISPLAYMANAGER_STARTS_XSERVER (we always have a local display manager,
@@ -2210,7 +2210,7 @@ Index: gdm-2.29.5/common/gdm-settings-system-backend.c
val = g_strdup (xdmcp ? "true" : "false");
}
}
+ } else if (!strcasecmp (key, GDM_KEY_SUSE_SHOW_DOMAIN)) {
+ } else if (!strcasecmp (key, GDM_KEY_SHOW_DOMAIN)) {
+ if (priv->dirty_show_domain) {
+ val = g_strdup (priv->set_show_domain ? "true" : "false");
+ } else {
@@ -2248,7 +2248,7 @@ Index: gdm-2.29.5/common/gdm-settings-system-backend.c
} else if (!strcasecmp (key, GDM_KEY_XDMCP_ENABLE)) {
priv->set_xdmcp = value_to_boolean (value);
GDM_SETTINGS_SYSTEM_BACKEND (backend)->priv->dirty_xdmcp = TRUE;
+ } else if (!strcasecmp (key, GDM_KEY_SUSE_SHOW_DOMAIN)) {
+ } else if (!strcasecmp (key, GDM_KEY_SHOW_DOMAIN)) {
+ priv->set_show_domain = value_to_boolean (value);
+ GDM_SETTINGS_SYSTEM_BACKEND (backend)->priv->dirty_show_domain = TRUE;
} else {
@@ -2258,12 +2258,11 @@ Index: gdm-2.29.5/data/gdm.schemas.in.in
===================================================================
--- gdm-2.29.5.orig/data/gdm.schemas.in.in
+++ gdm-2.29.5/data/gdm.schemas.in.in
@@ -61,6 +61,12 @@
@@ -61,6 +61,11 @@
</schema>
<schema>
+ <!-- SUSE-specific -->
+ <key>greeter/SUSEShowDomain</key>
+ <key>greeter/ShowDomain</key>
+ <signature>b</signature>
+ <default>false</default>
+ </schema>