Changeset 7829 for branches/gajim_0.11/src/common/GnuPG.py

Timestamp:

01/13/07 23:35:41 (23 months ago)

Author:

asterix

Message:

merge diff from trunc to 0.11 branch

Files:

• branches/gajim_0.11/src/common/GnuPG.py (modified) (2 diffs)

branches/gajim_0.11/src/common/GnuPG.py

@@ -44 +44 @@
 
         class GnuPG(GnuPGInterface.GnuPG):
-                def __init__(self):
+                def __init__(self, use_agent = False):
                         GnuPGInterface.GnuPG.__init__(self)
+                        self.use_agent = use_agent
                         self._setup_my_options()
 
@@ -54 +55 @@
                         # Nolith's patch - prevent crashs on non fully-trusted keys
                         self.options.extra_args.append('--always-trust')
+                        if self.use_agent:
+                                self.options.extra_args.append('--use-agent')
 
                 def _read_response(self, child_stdout):