Ignore:
Timestamp:
Dec 14, 2016, 5:33:02 PM (3 years ago)
Author:
kbut
Message:

Update from upstream

File:
1 edited

Legend:

Unmodified
Added
Removed
  • ubiquity/trunk/fuentes/ubiquity/plugins/ubi-prepare.py

    r1475 r3069  
    125125        self.using_secureboot = secureboot
    126126        self.secureboot_box.set_visible(secureboot)
     127        self.disable_secureboot.set_active(True)
    127128        self.on_nonfree_toggled(None)
     129        self.info_loop(None)
    128130
    129131    def enable_download_updates(self, val):
     
    175177        enabled = self.get_use_nonfree()
    176178        self.secureboot_box.set_sensitive(enabled)
     179        self.info_loop(None)
    177180
    178181    def on_secureboot_toggled(self, widget):
     
    182185
    183186    def info_loop(self, unused_widget):
     187        if not self.get_use_nonfree() \
     188                or not self.password_grid.get_sensitive():
     189            self.controller.allow_go_forward(True)
     190            return True
     191
    184192        complete = False
    185193        passw = self.password.get_text()
     
    196204                self.password_strength_pages['too_short'])
    197205
    198         if passw != vpassw or (passw and len(passw) < 8):
     206        if len(passw) == 0 or len(vpassw) == 0:
     207            self.password_match.set_current_page(
     208                self.password_match_pages['empty'])
     209        elif passw != vpassw or (passw and len(passw) < 8):
    199210            self.password_match.set_current_page(
    200211                self.password_match_pages['empty'])
Note: See TracChangeset for help on using the changeset viewer.