[4285] | 1 | diff -up gdm2setup-0.5.3-lucid/gdm2/gdm2gconf.py.fix-timedlogin gdm2setup-0.5.3-lucid/gdm2/gdm2gconf.py |
---|
| 2 | --- gdm2setup-0.5.3-lucid/gdm2/gdm2gconf.py.fix-timedlogin 2011-07-05 09:08:36.818889819 +0900 |
---|
| 3 | +++ gdm2setup-0.5.3-lucid/gdm2/gdm2gconf.py 2011-07-05 09:09:20.039889819 +0900 |
---|
| 4 | @@ -63,7 +63,10 @@ class GDM2Theme(object): |
---|
| 5 | config = ConfigParser.RawConfigParser() |
---|
| 6 | config.optionxform = str |
---|
| 7 | config.read(self.GDMCONF_FILE) |
---|
| 8 | - return config.getboolean('daemon', 'AutomaticLoginEnable') |
---|
| 9 | + TimedLoginEnable = config.getboolean('daemon', 'TimedLoginEnable') |
---|
| 10 | + AutomaticLoginEnable = config.getboolean('daemon', 'AutomaticLoginEnable') |
---|
| 11 | + if TimedLoginEnable == True or AutomaticLoginEnable == True: |
---|
| 12 | + return True |
---|
| 13 | except: |
---|
| 14 | return False |
---|
| 15 | |
---|
| 16 | @@ -82,6 +85,10 @@ class GDM2Theme(object): |
---|
| 17 | config = ConfigParser.RawConfigParser() |
---|
| 18 | config.optionxform = str |
---|
| 19 | config.read(self.GDMCONF_FILE) |
---|
| 20 | + if AutomaticLoginEnable: |
---|
| 21 | + config.set('daemon','TimedLoginEnable','False') |
---|
| 22 | + else: |
---|
| 23 | + config.set('daemon','TimedLoginEnable','True') |
---|
| 24 | config.set('daemon','AutomaticLoginEnable',AutomaticLoginEnable) |
---|
| 25 | config.set('daemon','AutomaticLogin',User) |
---|
| 26 | with open(self.GDMCONF_FILE, 'wb') as configfile: |
---|
| 27 | @@ -143,6 +150,11 @@ class GDM2Theme(object): |
---|
| 28 | config = ConfigParser.RawConfigParser() |
---|
| 29 | config.optionxform = str |
---|
| 30 | config.read(self.GDMCONF_FILE) |
---|
| 31 | + AutomaticLogin = config.get('daemon', 'AutomaticLogin') |
---|
| 32 | + if TimedLoginEnable or AutomaticLogin == 'None': |
---|
| 33 | + config.set('daemon','AutomaticLoginEnable','False') |
---|
| 34 | + else: |
---|
| 35 | + config.set('daemon','AutomaticLoginEnable','True') |
---|
| 36 | config.set('daemon','TimedLoginEnable',TimedLoginEnable) |
---|
| 37 | config.set('daemon','TimedLogin',User) |
---|
| 38 | config.set('daemon','TimedLoginDelay',TimedLoginDelay) |
---|