- Update to snapshot
This commit is contained in:
parent
261ba9e606
commit
4e0319347e
@ -1 +1 @@
|
||||
gdm-2.22.0.tar.gz
|
||||
gdm-2.23.1.tar.bz2
|
||||
|
155
default.desktop
155
default.desktop
@ -1,155 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
# The names/descriptions should really be better
|
||||
Name=Default System Session
|
||||
Name[af]=Verstekstelselsessie
|
||||
Name[ar]=جلسة النظام الافتراضية
|
||||
Name[az]=Ön Qurğulu Sistem İclası
|
||||
Name[be]=Дапомная сыстэмная сэсыя
|
||||
Name[bg]=Стандартна системна сесия
|
||||
Name[bn]=ডিফল্ট সিস্টেম সেশন
|
||||
Name[bn_IN]=সিস্টেমের ডিফল্ট সেশান
|
||||
Name[bs]=UobiÄŤajna sesija sistema
|
||||
Name[ca]=Sessió predeterminada del sistema
|
||||
Name[cs]=Implicitní sezení systému
|
||||
Name[cy]=Sesiwn Rhagosodedig y System
|
||||
Name[da]=Forvalgt systemsession
|
||||
Name[de]=Voreingestellte Systemsitzung
|
||||
Name[dz]=རིམ་ལུགས་སྔོན་སྒྲིག་ལཱ་ཡུན།
|
||||
Name[el]=Προεπιλεγμένη συνεδρία συστήματος
|
||||
Name[en_CA]=Default System Session
|
||||
Name[en_GB]=Default System Session
|
||||
Name[es]=Sesión predeterminada del sistema
|
||||
Name[et]=Vaikimisi süsteemne seanss
|
||||
Name[eu]=Sistema-saio lehenetsia
|
||||
Name[fa]=نشست پیشفرض سیستم
|
||||
Name[fi]=Järjestelmän oletusistunto
|
||||
Name[fr]=Session par défaut du système
|
||||
Name[gl]=Sesión por defecto do sistema
|
||||
Name[gu]=મૂળભૂત સિસ્ટમ સત્ર
|
||||
Name[he]=תצורת ההפעלה ברירת המחדל של המערכת
|
||||
Name[hi]=मूलभूत सिस्टम सत्र
|
||||
Name[hr]=Uobičajena sesija na sistemu
|
||||
Name[hu]=Alapértelmezett rendszerkörnyezet
|
||||
Name[id]=Sesi Sistem Standar
|
||||
Name[it]=Sessione di sistema predefinita
|
||||
Name[ja]=デフォルトのシステム・セッション
|
||||
Name[ka]=სისტემის სტანდარტული სესია
|
||||
Name[ko]=기본 시스템 세션
|
||||
Name[ku]=Rûniştina pergalê ya heyî
|
||||
Name[lt]=Numatytoji sistemos sesija
|
||||
Name[lv]=Noklusētā sistēmas sesija
|
||||
Name[mg]=Session'ny rafitra tsotra
|
||||
Name[mk]=Стандардна сесија
|
||||
Name[ml]=ഡീഫോള്ട്ട് സിസ്റ്റം സെഷന്
|
||||
Name[mn]=Системийн стандарт суулт
|
||||
Name[mr]=मुलभूत प्रणाली सत्र
|
||||
Name[ms]=Sesi Sistem Default
|
||||
Name[nb]=Forvalgt sesjon for systemet
|
||||
Name[ne]=पूर्वनिर्धारित प्रणाली सत्र
|
||||
Name[nl]=Standaard systeemsessie
|
||||
Name[nn]=Systemet si standardøkt
|
||||
Name[nso]=Lenaneo la Tshepedišo la Tlhaelelo
|
||||
Name[or]=ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ତନ୍ତ୍ର ଅଧିବେଶନ
|
||||
Name[pa]=ਮੂਲ ਸਿਸਟਮ ਅਜਲਾਸ
|
||||
Name[pl]=Domyślna sesja systemu
|
||||
Name[pt]=Sessão de Sistema por Omissão
|
||||
Name[pt_BR]=Sessão Padrão do Sistema
|
||||
Name[ro]=Sesiune implicită
|
||||
Name[ru]=Системный сеанс по умолчанию
|
||||
Name[sk]=Štandardné sedenie systému
|
||||
Name[sl]=Privzeta seja sistema
|
||||
Name[sq]=Seanca e prezgjedhur e sistemit
|
||||
Name[sr]=Подразумевана сесија на систему
|
||||
Name[sr@Latn]=Podrazumevana sesija na sistemu
|
||||
Name[sv]=Standardsystemsession
|
||||
Name[ta]=முன்னிருப்பு கணிணி அமர்வு
|
||||
Name[th]=วาระระบบปริยาย
|
||||
Name[tr]=Öntanımlı Sistem Oturumu
|
||||
Name[uk]=Типовий системний сеанс
|
||||
Name[vi]=Phiên chạy hệ thống mặc định
|
||||
Name[wa]=Prémetowe session do sistinme
|
||||
Name[xh]=ISeshoni yeNkqubo eMiselweyo
|
||||
Name[zh_CN]=系统默认会话
|
||||
Name[zh_HK]=預設系統作業階段
|
||||
Name[zh_TW]=預設系統作業階段
|
||||
Name[zu]=inhlangano yohlelo enephutha
|
||||
Comment=This is the default system session
|
||||
Comment[af]=Hierdie is die verstekstelselsessie
|
||||
Comment[ar]=هذه جلسة النظام الإفتراضية
|
||||
Comment[az]=Bu ön qurğulu sistem iclasıdır
|
||||
Comment[be]=Гэта дапмная сыстэмная сэсыя
|
||||
Comment[bg]=Това е стандартната системна сесия
|
||||
Comment[bn]=এটি হচ্ছে সিস্টেমের ডিফল্ট সেশন
|
||||
Comment[bn_IN]=এটি সিস্টেমের ডিফল্ট সেশান
|
||||
Comment[bs]=Ovo je uobiÄŤajna sesija sistema
|
||||
Comment[ca]=Aquesta és la sessió predeterminada del sistema
|
||||
Comment[cs]=Toto je implicitní sezení systému
|
||||
Comment[cy]=Dyma sesiwn rhagosodedig y system
|
||||
Comment[da]=Dette er den forvalgte systemsession
|
||||
Comment[de]=Dies ist die voreingestellte Systemsitzung
|
||||
Comment[dz]=འདི་རིམ་ལུགས་སྔོན་སྒྲིག་ལཱ་ཡུན་ཨིན།
|
||||
Comment[el]=Αυτή είναι η προεπιλεγμένη συνεδρία συστήματος
|
||||
Comment[en_CA]=This is the default system session
|
||||
Comment[en_GB]=This is the default system session
|
||||
Comment[es]=Ésta es la sesión predeterminada del sistema
|
||||
Comment[et]=See on vaikimisi süsteemne seanss
|
||||
Comment[eu]=Hau sistema-saio lehenetsia da
|
||||
Comment[fa]=این نشست پیشفرض سیستم است
|
||||
Comment[fi]=Tämä on järjestelmän oletusistunto
|
||||
Comment[fr]=Ceci est la session par défaut du système
|
||||
Comment[gl]=Esta é a sesión do sistema por defecto
|
||||
Comment[gu]=આ એક મૂળભૂત સિસ્ટમ સત્ર છે
|
||||
Comment[he]=זוהי תצורת ההפעלה ברירת המחדל של המערכת
|
||||
Comment[hi]=यह मूलभूत सिस्टम सत्र है
|
||||
Comment[hr]=Ovo je uobičajena sesija na sistemu
|
||||
Comment[hu]=Ez az alapértelmezett rendszerkörnyezet
|
||||
Comment[id]=Login dengan sesi sistem standar
|
||||
Comment[it]=Questa è la sessione di sistema predefinita
|
||||
Comment[ja]=これはデフォルトのシステム・セッションです
|
||||
Comment[ka]=ეს არის სისტემის სტანდარტული სესია
|
||||
Comment[ko]=기본 시스템 세션을 사용해 로그인합니다
|
||||
Comment[ku]=Ev rûniştina ya heyî ya pergalê ye
|
||||
Comment[lt]=Tai numatytoji sistemos sesija
|
||||
Comment[lv]=Šī ir noklusētā sistēmas sesija
|
||||
Comment[mg]=Io ny session'ny rafitra tsotra
|
||||
Comment[mk]=Ова е стандардната сесија
|
||||
Comment[ml]=ഇതാണ് സിസ്റ്റത്തിന്റെ ഡീഫോള്ട്ടായി സെഷന്
|
||||
Comment[mn]=Энэ бол системийн стандарт суулт
|
||||
Comment[mr]=हे मुलभूत प्रणाली सत्र आहे
|
||||
Comment[ms]=Ini ialah sesi default sistem
|
||||
Comment[nb]=Dette er forvalgt sesjon for systemet
|
||||
Comment[ne]=यो पूर्वनिर्धारित प्रणाली सत्र हो
|
||||
Comment[nl]=Dit is de standaardsessie op het systeem
|
||||
Comment[nn]=Dette er systemet si standardøkt
|
||||
Comment[nso]=Le ke lenaneo la tshepedišo la tlhaelelo
|
||||
Comment[or]=ଏହା ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ତନ୍ତ୍ର ଅଧିବେଶନ ଅଟେ
|
||||
Comment[pa]=ਇਹ ਮੂਲ ਸਿਸਟਮ ਅਜਲਾਸ ਹੈ
|
||||
Comment[pl]=Domyślna sesja systemu
|
||||
Comment[pt]=Esta é a sessão de sistema por omissão
|
||||
Comment[pt_BR]=Esta é uma sessão padrão do sistema
|
||||
Comment[ro]=Aceasta este sesiunea implicită a sistemului
|
||||
Comment[ru]=Это системный сеанс по умолчанию
|
||||
Comment[sk]=Toto je štandardné sedenie systému
|
||||
Comment[sl]=To je privzeta seja sistema
|
||||
Comment[sq]=Kjo është seanca e prezgjedhur e sistemit
|
||||
Comment[sr]=Ово је подразумевана сесија на систему
|
||||
Comment[sr@Latn]=Ovo je podrazumevana sesija na sistemu
|
||||
Comment[sv]=Det här är standardsystemsessionen
|
||||
Comment[ta]=இது ஒரு முன்னிருப்பு கணிணி அமர்வு
|
||||
Comment[th]=นี่คือวาระปริยายของระบบ
|
||||
Comment[tr]=Bu öntanımlı sistem oturumudur
|
||||
Comment[uk]=Це типовий системний сеанс
|
||||
Comment[vi]=Đây là phiên chạy hệ thống mặc định
|
||||
Comment[wa]=Çouci est li prémetowe session do sistinme, po s' elodjî tot-z eployant li lingaedje defini dins les prémetowès valixhances do sistinme
|
||||
Comment[xh]=Le yiseshoni yenkqubo emiselweyo
|
||||
Comment[zh_CN]=系统默认的会话
|
||||
Comment[zh_HK]=這是系統預設的作業階段
|
||||
Comment[zh_TW]=這是系統預設的作業階段
|
||||
Comment[zu]=Lokho inhlangano yohlelo enephutha
|
||||
Exec=default
|
||||
# The "default" Exec is a very special one and is handled specially in
|
||||
# the Xsession script, you could also have "custom" which would just run
|
||||
# "~/.xsession" directly
|
||||
Icon=
|
||||
Type=Application
|
@ -1,13 +0,0 @@
|
||||
Index: gdm/gui/simple-greeter/gdm-simple-greeter.schemas.in
|
||||
===================================================================
|
||||
--- gdm/gui/simple-greeter/gdm-simple-greeter.schemas.in (revision 5874)
|
||||
+++ gdm/gui/simple-greeter/gdm-simple-greeter.schemas.in (working copy)
|
||||
@@ -6,7 +6,7 @@
|
||||
<applyto>/apps/gdm/simple-greeter/logo-icon-name</applyto>
|
||||
<owner>gdm-simple-greeter</owner>
|
||||
<type>string</type>
|
||||
- <default>computer</default>
|
||||
+ <default>start-here</default>
|
||||
<locale name="C">
|
||||
<short>Icon name to use for greeter logo</short>
|
||||
<long>Set to the themed icon name to use for the greeter logo.</long>
|
@ -1,60 +0,0 @@
|
||||
diff -up gdm-2.22.0/common/gdm-settings-keys.h.enable-tcp gdm-2.22.0/common/gdm-settings-keys.h
|
||||
--- gdm-2.22.0/common/gdm-settings-keys.h.enable-tcp 2008-04-17 23:29:27.000000000 -0400
|
||||
+++ gdm-2.22.0/common/gdm-settings-keys.h 2008-06-25 11:19:51.000000000 -0400
|
||||
@@ -31,6 +31,8 @@ G_BEGIN_DECLS
|
||||
#define GDM_KEY_TIMED_LOGIN_USER "daemon/TimedLogin"
|
||||
#define GDM_KEY_TIMED_LOGIN_DELAY "daemon/TimedLoginDelay"
|
||||
|
||||
+#define GDM_KEY_DISALLOW_TCP "security/DisallowTCP"
|
||||
+
|
||||
#define GDM_KEY_XDMCP_ENABLE "xdmcp/Enable"
|
||||
#define GDM_KEY_MAX_PENDING "xdmcp/MaxPending"
|
||||
#define GDM_KEY_MAX_SESSIONS "xdmcp/MaxSessions"
|
||||
diff -up gdm-2.22.0/daemon/gdm-simple-slave.c.enable-tcp gdm-2.22.0/daemon/gdm-simple-slave.c
|
||||
--- gdm-2.22.0/daemon/gdm-simple-slave.c.enable-tcp 2008-06-25 11:19:51.000000000 -0400
|
||||
+++ gdm-2.22.0/daemon/gdm-simple-slave.c 2008-06-25 11:29:44.000000000 -0400
|
||||
@@ -1003,8 +1003,18 @@ gdm_simple_slave_run (GdmSimpleSlave *sl
|
||||
* exist */
|
||||
if (display_is_local) {
|
||||
gboolean res;
|
||||
+ gboolean disable_tcp;
|
||||
|
||||
slave->priv->server = gdm_server_new (display_name, auth_file);
|
||||
+
|
||||
+ disable_tcp = TRUE;
|
||||
+ if (gdm_settings_client_get_boolean (GDM_KEY_DISALLOW_TCP,
|
||||
+ &disable_tcp)) {
|
||||
+ g_object_set (slave->priv->server,
|
||||
+ "disable-tcp", disable_tcp,
|
||||
+ NULL);
|
||||
+ }
|
||||
+
|
||||
g_signal_connect (slave->priv->server,
|
||||
"exited",
|
||||
G_CALLBACK (on_server_exited),
|
||||
diff -up gdm-2.22.0/data/gdm.conf-custom.in.enable-tcp gdm-2.22.0/data/gdm.conf-custom.in
|
||||
--- gdm-2.22.0/data/gdm.conf-custom.in.enable-tcp 2008-04-17 23:29:29.000000000 -0400
|
||||
+++ gdm-2.22.0/data/gdm.conf-custom.in 2008-06-25 11:19:51.000000000 -0400
|
||||
@@ -4,4 +4,6 @@
|
||||
|
||||
[chooser]
|
||||
|
||||
+[security]
|
||||
+
|
||||
[debug]
|
||||
diff -up gdm-2.22.0/data/gdm.schemas.in.enable-tcp gdm-2.22.0/data/gdm.schemas.in
|
||||
--- gdm-2.22.0/data/gdm.schemas.in.enable-tcp 2008-04-20 09:51:56.000000000 -0400
|
||||
+++ gdm-2.22.0/data/gdm.schemas.in 2008-06-25 11:19:51.000000000 -0400
|
||||
@@ -28,6 +28,12 @@
|
||||
</schema>
|
||||
|
||||
<schema>
|
||||
+ <key>security/DisallowTCP</key>
|
||||
+ <signature>b</signature>
|
||||
+ <default>true</default>
|
||||
+ </schema>
|
||||
+
|
||||
+ <schema>
|
||||
<key>xdmcp/Enable</key>
|
||||
<signature>b</signature>
|
||||
<default>false</default>
|
11
gdm-2.23.1-fedora-logo.patch
Normal file
11
gdm-2.23.1-fedora-logo.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- gdm-2.23.1/gui/simple-greeter/gdm-simple-greeter.schemas.in.fedora-logo 2008-07-21 11:14:46.000000000 -0400
|
||||
+++ gdm-2.23.1/gui/simple-greeter/gdm-simple-greeter.schemas.in 2008-07-21 14:59:17.000000000 -0400
|
||||
@@ -39,7 +39,7 @@
|
||||
<applyto>/apps/gdm/simple-greeter/logo_icon_name</applyto>
|
||||
<owner>gdm-simple-greeter</owner>
|
||||
<type>string</type>
|
||||
- <default>computer</default>
|
||||
+ <default>start-here</default>
|
||||
<locale name="C">
|
||||
<short>Icon name to use for greeter logo</short>
|
||||
<long>Set to the themed icon name to use for the greeter logo.</long>
|
File diff suppressed because it is too large
Load Diff
@ -1,23 +0,0 @@
|
||||
Index: gdm/gui/simple-greeter/gdm-user.c
|
||||
===================================================================
|
||||
--- gdm/gui/simple-greeter/gdm-user.c (revision 6253)
|
||||
+++ gdm/gui/simple-greeter/gdm-user.c (working copy)
|
||||
@@ -750,11 +750,13 @@ render_icon_from_home (GdmUser *user,
|
||||
}
|
||||
filesystem_type = g_file_info_get_attribute_string (file_info,
|
||||
G_FILE_ATTRIBUTE_FILESYSTEM_TYPE);
|
||||
- is_local = ((strcmp (filesystem_type, "nfs") != 0) &&
|
||||
- (strcmp (filesystem_type, "afs") != 0) &&
|
||||
- (strcmp (filesystem_type, "autofs") != 0) &&
|
||||
- (strcmp (filesystem_type, "unknown") != 0) &&
|
||||
- (strcmp (filesystem_type, "ncpfs") != 0));
|
||||
+ if (filesystem_type != NULL) {
|
||||
+ is_local = ((strcmp (filesystem_type, "nfs") != 0) &&
|
||||
+ (strcmp (filesystem_type, "afs") != 0) &&
|
||||
+ (strcmp (filesystem_type, "autofs") != 0) &&
|
||||
+ (strcmp (filesystem_type, "unknown") != 0) &&
|
||||
+ (strcmp (filesystem_type, "ncpfs") != 0));
|
||||
+ }
|
||||
g_object_unref (file_info);
|
||||
g_object_unref (file);
|
||||
}
|
33
gdm.spec
33
gdm.spec
@ -14,13 +14,13 @@
|
||||
|
||||
Summary: The GNOME Display Manager
|
||||
Name: gdm
|
||||
Version: 2.22.0
|
||||
Release: 12%{?dist}
|
||||
Version: 2.23.1
|
||||
Release: 0.2008.07.21.1%{?dist}
|
||||
Epoch: 1
|
||||
License: GPLv2+
|
||||
Group: User Interface/X
|
||||
URL: http://download.gnome.org/sources/gdm
|
||||
Source: http://download.gnome.org/sources/gdm/2.22/gdm-%{version}.tar.gz
|
||||
Source: http://download.gnome.org/sources/gdm/2.23/gdm-%{version}.tar.bz2
|
||||
Source1: gdm-pam
|
||||
Source2: gdm-autologin-pam
|
||||
Source3: gdmsetup-pam
|
||||
@ -77,25 +77,9 @@ BuildRequires: libxklavier-devel
|
||||
|
||||
Requires: audit-libs >= %{libauditver}
|
||||
Patch1: xkb-groups.patch
|
||||
# from upstream svn
|
||||
Patch2: gdm-keyboard-chooser.patch
|
||||
# from upstream svn
|
||||
Patch3: show-users.patch
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=446672
|
||||
Patch4: gdm-2.22.0-enable-tcp.patch
|
||||
|
||||
# fixed in upstream svn
|
||||
Patch9: gdm-null-fs.patch
|
||||
|
||||
# fixed in upstream svn
|
||||
Patch10: lang-tag.patch
|
||||
|
||||
# fixed in upstream svn
|
||||
Patch11: icon-names.patch
|
||||
|
||||
# Fedora-specific
|
||||
Patch99: gdm-2.21.8-fedora-logo.patch
|
||||
Patch99: gdm-2.23.1-fedora-logo.patch
|
||||
|
||||
%package user-switch-applet
|
||||
Summary: GDM User Switcher Panel Applet
|
||||
@ -115,12 +99,6 @@ multiple simulanteous logged in users.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .xkb-groups
|
||||
%patch2 -p1 -b .keyboard-chooser
|
||||
%patch3 -p1 -b .show-users
|
||||
%patch4 -p1 -b .enable-tcp
|
||||
%patch9 -p1 -b .null-fs
|
||||
%patch10 -p1 -b .lang-tag
|
||||
%patch11 -p1 -b .icon-names
|
||||
%patch99 -p1 -b .fedora-logo
|
||||
|
||||
autoreconf
|
||||
@ -320,6 +298,9 @@ fi
|
||||
%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
|
||||
|
||||
%changelog
|
||||
* Mon Jul 21 2008 Jon McCann <jmccann@redhat.com> - 1:2.23.1.0.2008.07.21.1
|
||||
- Update to snapshot
|
||||
|
||||
* Fri Jul 11 2008 Matthias Clasen <mclasen@redhat.com> - 1:2.22.0-12
|
||||
- Actually apply the patch
|
||||
|
||||
|
@ -1,25 +0,0 @@
|
||||
diff -up gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c
|
||||
--- gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.icon-names 2008-07-10 12:55:21.000000000 -0400
|
||||
+++ gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c 2008-07-10 12:57:47.000000000 -0400
|
||||
@@ -233,7 +233,7 @@ gdm_language_option_widget_new (void)
|
||||
|
||||
object = g_object_new (GDM_TYPE_LANGUAGE_OPTION_WIDGET,
|
||||
"label-text", _("_Language:"),
|
||||
- "icon-name", "config-language",
|
||||
+ "icon-name", "preferences-desktop-locale",
|
||||
"max-item-count", 8,
|
||||
NULL);
|
||||
|
||||
diff -up gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c
|
||||
--- gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c.icon-names 2008-07-10 13:08:38.000000000 -0400
|
||||
+++ gdm-2.22.0/gui/simple-greeter/gdm-layout-option-widget.c 2008-07-10 13:06:41.000000000 -0400
|
||||
@@ -226,7 +226,7 @@ gdm_layout_option_widget_new (void)
|
||||
|
||||
object = g_object_new (GDM_TYPE_LAYOUT_OPTION_WIDGET,
|
||||
"label-text", _("_Keyboard:"),
|
||||
- "icon-name", "keyboard",
|
||||
+ "icon-name", "preferences-desktop-keyboard",
|
||||
"max-item-count", 8,
|
||||
NULL);
|
||||
|
||||
diff -up gdm-2.22.0/gui/simple-greeter/gdm-session-option-widget.c.icon-names gdm-2.22.0/gui/simple-greeter/gdm-session-option-widget.c
|
@ -1,64 +0,0 @@
|
||||
diff -up gdm-2.22.0/gui/simple-greeter/gdm-language-chooser-widget.c.lang-tag gdm-2.22.0/gui/simple-greeter/gdm-language-chooser-widget.c
|
||||
--- gdm-2.22.0/gui/simple-greeter/gdm-language-chooser-widget.c.lang-tag 2008-07-10 01:10:23.000000000 -0400
|
||||
+++ gdm-2.22.0/gui/simple-greeter/gdm-language-chooser-widget.c 2008-07-10 01:10:28.000000000 -0400
|
||||
@@ -103,24 +103,30 @@ gdm_language_chooser_widget_add_language
|
||||
char *language;
|
||||
char *normalized_name;
|
||||
char *readable_language;
|
||||
+ char *lang_tag;
|
||||
+ char *tagged;
|
||||
|
||||
normalized_name = gdm_normalize_language_name (name);
|
||||
+ gdm_parse_language_name (name, &lang_tag, NULL, NULL, NULL);
|
||||
language = gdm_get_language_from_name (normalized_name, normalized_name);
|
||||
readable_language = gdm_get_language_from_name (normalized_name, NULL);
|
||||
|
||||
+ tagged = g_strdup_printf ("<span lang=\"%s\">%s</span>", lang_tag, language);
|
||||
+
|
||||
if (language != NULL) {
|
||||
gdm_chooser_widget_add_item (GDM_CHOOSER_WIDGET (widget),
|
||||
normalized_name,
|
||||
NULL,
|
||||
- language,
|
||||
- readable_language,
|
||||
+ tagged,
|
||||
+ readable_language,
|
||||
0,
|
||||
FALSE,
|
||||
FALSE);
|
||||
g_free (language);
|
||||
}
|
||||
g_free (readable_language);
|
||||
-
|
||||
+ g_free (tagged);
|
||||
+ g_free (lang_tag);
|
||||
g_free (normalized_name);
|
||||
}
|
||||
|
||||
diff -up gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.lang-tag gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c
|
||||
--- gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c.lang-tag 2008-07-10 11:42:07.000000000 -0400
|
||||
+++ gdm-2.22.0/gui/simple-greeter/gdm-language-option-widget.c 2008-07-10 11:42:24.000000000 -0400
|
||||
@@ -146,6 +146,7 @@ gdm_language_option_widget_lookup_item (
|
||||
{
|
||||
char *language;
|
||||
char *readable_language;
|
||||
+ char *lang_tag;
|
||||
|
||||
language = gdm_get_language_from_name (locale, locale);
|
||||
|
||||
@@ -154,10 +155,13 @@ gdm_language_option_widget_lookup_item (
|
||||
}
|
||||
|
||||
readable_language = gdm_get_language_from_name (locale, NULL);
|
||||
-
|
||||
- *name = language;
|
||||
+ gdm_parse_language_name (locale, &lang_tag, NULL, NULL, NULL);
|
||||
+ *name = g_strdup_printf ("<span lang=\"%s\">%s</span>", lang_tag, language);
|
||||
*comment = readable_language;
|
||||
|
||||
+ g_free (language);
|
||||
+ g_free (lang_tag);
|
||||
+
|
||||
return TRUE;
|
||||
}
|
||||
|
@ -1,90 +0,0 @@
|
||||
--- gdm-2.22.0/gui/simple-greeter/gdm-user-chooser-widget.c 2008-05-01 18:35:35.000000000 -0400
|
||||
+++ hacked/gui/simple-greeter/gdm-user-chooser-widget.c 2008-05-07 20:27:09.000000000 -0400
|
||||
@@ -34,9 +34,14 @@
|
||||
#include <glib/gstdio.h>
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
+#include <gconf/gconf-client.h>
|
||||
+
|
||||
#include "gdm-user-manager.h"
|
||||
#include "gdm-user-chooser-widget.h"
|
||||
|
||||
+
|
||||
+#define KEY_DISABLE_USER_LIST "/apps/gdm/simple-greeter/disable_user_list"
|
||||
+
|
||||
enum {
|
||||
USER_NO_DISPLAY = 1 << 0,
|
||||
USER_ACCOUNT_DISABLED = 1 << 1,
|
||||
@@ -59,6 +64,7 @@
|
||||
guint show_other_user : 1;
|
||||
guint show_guest_user : 1;
|
||||
guint show_auto_user : 1;
|
||||
+ guint show_normal_users : 1;
|
||||
};
|
||||
|
||||
enum {
|
||||
@@ -231,6 +237,25 @@
|
||||
}
|
||||
}
|
||||
|
||||
+static gboolean
|
||||
+is_user_list_disabled (GdmUserChooserWidget *widget)
|
||||
+{
|
||||
+ GConfClient *client;
|
||||
+ GError *error;
|
||||
+ gboolean result;
|
||||
+
|
||||
+ client = gconf_client_get_default ();
|
||||
+ error = NULL;
|
||||
+ result = gconf_client_get_bool (client, KEY_DISABLE_USER_LIST, &error);
|
||||
+ if (error != NULL) {
|
||||
+ g_debug ("GdmUserChooserWidget: unable to get disable-user-list configuration: %s", error->message);
|
||||
+ g_error_free (error);
|
||||
+ }
|
||||
+ g_object_unref (client);
|
||||
+
|
||||
+ return result;
|
||||
+}
|
||||
+
|
||||
static GObject *
|
||||
gdm_user_chooser_widget_constructor (GType type,
|
||||
guint n_construct_properties,
|
||||
@@ -247,6 +272,8 @@
|
||||
gdm_user_chooser_widget_set_show_auto_user (user_chooser_widget, FALSE);
|
||||
gdm_user_chooser_widget_set_show_other_user (user_chooser_widget, TRUE);
|
||||
|
||||
+ user_chooser_widget->priv->show_normal_users = !is_user_list_disabled (user_chooser_widget);
|
||||
+
|
||||
return G_OBJECT (user_chooser_widget);
|
||||
}
|
||||
|
||||
@@ -403,6 +430,9 @@
|
||||
char *tooltip;
|
||||
gboolean is_logged_in;
|
||||
|
||||
+ if (!widget->priv->show_normal_users)
|
||||
+ return;
|
||||
+
|
||||
pixbuf = gdm_user_render_icon (user, ICON_SIZE);
|
||||
if (pixbuf == NULL && widget->priv->stock_person_pixbuf != NULL) {
|
||||
pixbuf = g_object_ref (widget->priv->stock_person_pixbuf);
|
||||
--- gdm-2.22.0/gui/simple-greeter/gdm-simple-greeter.schemas.in 2008-05-07 20:28:57.000000000 -0400
|
||||
+++ hacked/gui/simple-greeter/gdm-simple-greeter.schemas.in 2008-05-07 20:22:33.000000000 -0400
|
||||
@@ -68,6 +68,17 @@
|
||||
</locale>
|
||||
</schema>
|
||||
<schema>
|
||||
+ <key>/schemas/apps/gdm/simple-greeter/disable_user_list</key>
|
||||
+ <applyto>/apps/gdm/simple-greeter/disable_user_list</applyto>
|
||||
+ <owner>gdm-simple-greeter</owner>
|
||||
+ <type>bool</type>
|
||||
+ <default>FALSE</default>
|
||||
+ <locale name="C">
|
||||
+ <short>Do not show known users in the login window</short>
|
||||
+ <long>Set to TRUE to disable showing known users in the login window.</long>
|
||||
+ </locale>
|
||||
+ </schema>
|
||||
+ <schema>
|
||||
<key>/schemas/apps/gdm/simple-greeter/wm_use_compiz</key>
|
||||
<applyto>/apps/gdm/simple-greeter/wm_use_compiz</applyto>
|
||||
<owner>gdm-simple-greeter</owner>
|
Loading…
Reference in New Issue
Block a user