Show
Ignore:
Timestamp:
12/12/07 09:44:46 (12 months ago)
Author:
asterix
Message:

merge diff from trunk

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • branches/pep/src/advanced.py

    r7848 r9123  
    11##      advanced.py 
    22## 
    3 ## Copyright (C) 2005-2006 Yann Le Boulanger <asterix@lagaule.org> 
     3## Copyright (C) 2005-2006 Yann Leboulanger <asterix@lagaule.org> 
    44## Copyright (C) 2005-2006 Nikos Kouremenos <kourem@gmail.com> 
    55## Copyright (C) 2005 Vincent Hanquez <tab@snarc.org> 
    66## 
    7 ## This program is free software; you can redistribute it and/or modify 
     7## This file is part of Gajim. 
     8## 
     9## Gajim is free software; you can redistribute it and/or modify 
    810## it under the terms of the GNU General Public License as published 
    9 ## by the Free Software Foundation; version 2 only. 
    10 ## 
    11 ## This program is distributed in the hope that it will be useful, 
     11## by the Free Software Foundation; version 3 only. 
     12## 
     13## Gajim is distributed in the hope that it will be useful, 
    1214## but WITHOUT ANY WARRANTY; without even the implied warranty of 
    1315## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
    1416## GNU General Public License for more details. 
     17## 
     18## You should have received a copy of the GNU General Public License 
     19## along with Gajim.  If not, see <http://www.gnu.org/licenses/>. 
    1520## 
    1621 
    … …  
    99104                optname = model[iter][C_PREFNAME] 
    100105                opttype = model[iter][C_TYPE] 
    101                 if opttype == self.types['boolean'] or optname in ('password',  
    102                         'gpgpassword'): 
     106                if opttype == self.types['boolean'] or optname == 'password': 
    103107                        cell.set_property('editable', False) 
    104108                else: 
    … …  
    235239                        type = self.types[type] # i18n 
    236240                value = val[OPT_VAL] 
    237                 if name in ('password', 'gpgpassword'): 
     241                if name == 'password': 
    238242                        #we talk about password 
    239243                        value = _('Hidden') # override passwords with this string