/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to seahorse.py

  • Committer: Daniel Schierbeck
  • Date: 2008-04-03 20:30:15 UTC
  • mto: (450.1.18 trunk)
  • mto: This revision was merged to the branch mainline in revision 458.
  • Revision ID: daniel.schierbeck@gmail.com-20080403203015-ch8ck8gyjjhhiggf
Made the crypt code only use one DBus call to get key fields.

Show diffs side-by-side

added added

removed removed

Lines of Context:
seahorse.py
74
74
 
75
75
    def __init__(self, key):
76
76
        self.key = key
77
 
        self.fingerprint = None
78
 
        self.trust = None
79
 
        self.flags = None
80
 
        self.display_name = None
81
 
        self.location = None
82
 
        
 
77
 
83
78
        (keys, unmatched) = openpgp.MatchKeys([self.get_id()], 0x00000010)
84
79
        self.available = (key in keys)
85
80
 
86
 
    def get_field(self, field, default=None):
87
 
        (valid, value) = openpgp.GetKeyField(self.key, field)
88
 
 
89
 
        if valid:
90
 
            return value
 
81
        if self.available:
 
82
            fields = openpgp.GetKeyFields(key, ['fingerprint', 'trust', 'flags', 'display-name', 'location'])
91
83
        else:
92
 
            return default
 
84
            fields = dict()
 
85
 
 
86
        self.fingerprint = fields.get('fingerprint', 'N/A')
 
87
        self.trust = fields.get('trust', TRUST_UNKNOWN)
 
88
        self.flags = fields.get('flags', 0)
 
89
        self.display_name = fields.get('display-name', '')
 
90
        self.location = fields.get('location', LOCATION_MISSING)
93
91
    
94
92
    def get_flags(self):
95
 
        if self.flags is None:
96
 
            self.flags = self.get_field('flags', 0)
97
 
 
98
93
        return self.flags
99
94
 
100
95
    def get_display_name(self):
101
 
        if self.display_name is None:
102
 
            self.display_name = self.get_field('display-name')
103
 
 
104
96
        return self.display_name
105
97
 
106
98
    def get_id(self):
107
99
        return self.key.split(':')[1][8:]
108
100
 
109
101
    def get_fingerprint(self):
110
 
        if self.fingerprint is None:
111
 
            self.fingerprint = self.get_field('fingerprint')
112
 
 
113
102
        return self.fingerprint
114
103
 
115
104
    def get_trust(self):
116
 
        if self.trust is None:
117
 
            self.trust = self.get_field('trust', TRUST_UNKNOWN)
118
 
 
119
105
        return self.trust
120
106
 
121
107
    def get_location(self):
122
 
        if self.location is None:
123
 
            self.location = self.get_field('location', LOCATION_MISSING)
124
 
 
125
108
        return self.location
126
109
 
127
110
    def is_available(self):
128
111
        return self.available
129
112
 
130
113
    def is_trusted(self):
131
 
        return self.get_flags() & FLAG_TRUSTED
 
114
        return self.flags & FLAG_TRUSTED != 0