Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
G
gajim-plugins
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Evert Mouw
gajim-plugins
Commits
da1f2867
Commit
da1f2867
authored
8 years ago
by
Philipp Hörist
Browse files
Options
Downloads
Patches
Plain Diff
[gotr] Fix importing python-otr Fixes #187
parent
37bad708
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
gotr/otrmodule.py
+3
-3
3 additions, 3 deletions
gotr/otrmodule.py
gotr/ui.py
+2
-3
2 additions, 3 deletions
gotr/ui.py
with
5 additions
and
6 deletions
gotr/otrmodule.py
+
3
−
3
View file @
da1f2867
...
...
@@ -76,10 +76,9 @@ from message_control import TYPE_CHAT, MessageControl
from
plugins.helpers
import
log_calls
,
log
from
plugins.plugin
import
GajimPluginException
sys
.
path
.
insert
(
0
,
os
.
path
.
dirname
(
__file__
))
import
ui
sys
.
path
.
insert
(
0
,
os
.
path
.
dirname
(
ui
.
__file__
))
from
HTMLParser
import
HTMLParser
from
htmlentitydefs
import
name2codepoint
name2codepoint
[
'
apos
'
]
=
0x0027
...
...
@@ -247,8 +246,9 @@ try:
except
IOError
,
e
:
log
.
exception
(
'
IOError occurred when loading fpr file for %s
'
,
self
.
name
)
except
ImportError
:
except
ImportError
as
e
:
HAS_POTR
=
False
print
(
e
)
def
otr_dialog_destroy
(
widget
,
*
args
,
**
kwargs
):
widget
.
destroy
()
...
...
This diff is collapsed.
Click to expand it.
gotr/ui.py
+
2
−
3
View file @
da1f2867
...
...
@@ -23,12 +23,11 @@ import gtk
from
common
import
gajim
from
plugins.gui
import
GajimPluginConfigDialog
import
otrmodule
try
:
import
potr
import
potr.proto
except
ImportError
:
p
ass
except
ImportError
as
e
:
p
rint
(
e
)
class
OtrPluginConfigDialog
(
GajimPluginConfigDialog
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment