copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename GnuPG.py to gpg.py. Fixes #6055

This commit is contained in:
Yann Leboulanger 2010-11-30 11:41:14 +01:00
parent b58248ac25
commit 49a797dd54
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/connection.py
View File

@ -54,7 +54,7 @@ if os.name != 'nt':
import common.xmpp import common.xmpp
from common import helpers from common import helpers
from common import gajim from common import gajim
from common import GnuPG from common import gpg
from common import passwords from common import passwords
from common import exceptions from common import exceptions
@ -123,7 +123,7 @@ class CommonConnection:
self.USE_GPG = False self.USE_GPG = False
if gajim.HAVE_GPG: if gajim.HAVE_GPG:
self.USE_GPG = True self.USE_GPG = True
self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent'))
self.status = '' self.status = ''
self.old_show = '' self.old_show = ''
self.priority = gajim.get_priority(name, 'offline') self.priority = gajim.get_priority(name, 'offline')
@ -633,7 +633,7 @@ class CommonConnection:
self.server_resource = self._compute_resource() self.server_resource = self._compute_resource()
if gajim.HAVE_GPG: if gajim.HAVE_GPG:
self.USE_GPG = True self.USE_GPG = True
self.gpg = GnuPG.GnuPG(gajim.config.get('use_gpg_agent')) self.gpg = gpg.GnuPG(gajim.config.get('use_gpg_agent'))
self.connect_and_init(show, msg, sign_msg) self.connect_and_init(show, msg, sign_msg)
return return
@ -853,7 +853,7 @@ class Connection(CommonConnection, ConnectionHandlers):
return return
if gajim.HAVE_GPG: if gajim.HAVE_GPG:
self.USE_GPG = True self.USE_GPG = True
self.gpg = GnuPG.GnuPG(gajim.config.get( self.gpg = gpg.GnuPG(gajim.config.get(
'use_gpg_agent')) 'use_gpg_agent'))
gajim.nec.push_incoming_event( gajim.nec.push_incoming_event(
AccountCreatedEvent(None, conn=self, AccountCreatedEvent(None, conn=self,

7
src/common/GnuPG.py → src/common/gpg.py
View File

@ -1,4 +1,4 @@
## src/common/GnuPG.py ## src/common/gpg.py
## ##
## Copyright (C) 2003-2010 Yann Leboulanger <asterix AT lagaule.org> ## Copyright (C) 2003-2010 Yann Leboulanger <asterix AT lagaule.org>
## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> ## Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net>
@ -22,11 +22,10 @@
## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## along with Gajim. If not, see <http://www.gnu.org/licenses/>.
## ##
import gajim from gajim import HAVE_GPG
import os import os
from os import tmpfile
if gajim.HAVE_GPG: if HAVE_GPG:
import gnupg import gnupg
class GnuPG(gnupg.GPG): class GnuPG(gnupg.GPG):

4
src/config.py
View File

@ -57,7 +57,7 @@ from common import connection
from common import passwords from common import passwords
from common.zeroconf import connection_zeroconf from common.zeroconf import connection_zeroconf
from common import dataforms from common import dataforms
from common import GnuPG from common import gpg
from common import ged from common import ged
try: try:
@ -2335,7 +2335,7 @@ class AccountsWindow:
# self.current_account is None and/or gajim.connections is {} # self.current_account is None and/or gajim.connections is {}
else: else:
if gajim.HAVE_GPG: if gajim.HAVE_GPG:
secret_keys = GnuPG.GnuPG().get_secret_keys() secret_keys = gpg.GnuPG().get_secret_keys()
else: else:
secret_keys = [] secret_keys = []
if not secret_keys: if not secret_keys: