Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
gajim
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Erik Huelsmann
gajim
Commits
b1decf2b
Commit
b1decf2b
authored
Jun 10, 2019
by
Philipp Hörist
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused argument
parent
c3461a43
Pipeline
#3565
failed with stages
in 0 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
10 deletions
+10
-10
gajim/chat_control.py
gajim/chat_control.py
+2
-2
gajim/chat_control_base.py
gajim/chat_control_base.py
+2
-2
gajim/conversation_textview.py
gajim/conversation_textview.py
+6
-6
No files found.
gajim/chat_control.py
View file @
b1decf2b
...
...
@@ -947,7 +947,7 @@ class ChatControl(ChatControlBase):
return
app
.
nicks
[
self
.
account
]
def
add_message
(
self
,
text
,
frm
=
''
,
tim
=
None
,
encrypted
=
None
,
subject
=
None
,
xhtml
=
None
,
simple
=
False
,
xep0184_id
=
None
,
subject
=
None
,
xhtml
=
None
,
xep0184_id
=
None
,
displaymarking
=
None
,
msg_log_id
=
None
,
correct_id
=
None
,
msg_stanza_id
=
None
,
additional_data
=
None
):
"""
...
...
@@ -988,7 +988,7 @@ class ChatControl(ChatControlBase):
xhtml
=
'<body xmlns="%s">%s</body>'
%
(
NS_XHTML
,
xhtml
)
ChatControlBase
.
add_message
(
self
,
text
,
kind
,
name
,
tim
,
subject
=
subject
,
old_kind
=
self
.
old_msg_kind
,
xhtml
=
xhtml
,
simple
=
simple
,
xep0184_id
=
xep0184_id
,
displaymarking
=
displaymarking
,
xep0184_id
=
xep0184_id
,
displaymarking
=
displaymarking
,
msg_log_id
=
msg_log_id
,
msg_stanza_id
=
msg_stanza_id
,
correct_id
=
correct_id
,
additional_data
=
additional_data
,
encrypted
=
encrypted
)
...
...
gajim/chat_control_base.py
View file @
b1decf2b
...
...
@@ -932,7 +932,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
def
add_message
(
self
,
text
,
kind
,
name
,
tim
,
other_tags_for_name
=
None
,
other_tags_for_time
=
None
,
other_tags_for_text
=
None
,
count_as_new
=
True
,
subject
=
None
,
old_kind
=
None
,
xhtml
=
None
,
simple
=
False
,
count_as_new
=
True
,
subject
=
None
,
old_kind
=
None
,
xhtml
=
None
,
xep0184_id
=
None
,
graphics
=
True
,
displaymarking
=
None
,
msg_log_id
=
None
,
msg_stanza_id
=
None
,
correct_id
=
None
,
additional_data
=
None
,
encrypted
=
None
):
...
...
@@ -958,7 +958,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
textview
.
print_conversation_line
(
text
,
kind
,
name
,
tim
,
other_tags_for_name
,
other_tags_for_time
,
other_tags_for_text
,
subject
,
old_kind
,
xhtml
,
simple
=
simple
,
graphics
=
graphics
,
subject
,
old_kind
,
xhtml
,
graphics
=
graphics
,
displaymarking
=
displaymarking
,
msg_stanza_id
=
msg_stanza_id
,
correct_id
=
correct_id
,
additional_data
=
additional_data
,
encrypted
=
encrypted
)
...
...
gajim/conversation_textview.py
View file @
b1decf2b
...
...
@@ -938,7 +938,7 @@ class ConversationTextview(GObject.GObject):
def
print_conversation_line
(
self
,
text
,
kind
,
name
,
tim
,
other_tags_for_name
=
None
,
other_tags_for_time
=
None
,
other_tags_for_text
=
None
,
subject
=
None
,
old_kind
=
None
,
xhtml
=
None
,
simple
=
False
,
graphics
=
True
,
subject
=
None
,
old_kind
=
None
,
xhtml
=
None
,
graphics
=
True
,
displaymarking
=
None
,
msg_stanza_id
=
None
,
correct_id
=
None
,
additional_data
=
None
,
encrypted
=
None
):
"""
...
...
@@ -1017,8 +1017,8 @@ class ConversationTextview(GObject.GObject):
self
.
print_encryption_status
(
iter_
,
additional_data
)
# print the time stamp
self
.
print_time
(
text
,
kind
,
tim
,
simple
,
direction_mark
,
other_tags_for_time
,
iter_
)
self
.
print_time
(
text
,
kind
,
tim
,
direction_mark
,
other_tags_for_time
,
iter_
)
# If there's a displaymarking, print it here.
if
displaymarking
:
...
...
@@ -1189,12 +1189,12 @@ class ConversationTextview(GObject.GObject):
trust
=
additional_data
.
get_value
(
'encrypted'
,
'trust'
)
return
name
,
fingerprint
,
trust
def
print_time
(
self
,
text
,
kind
,
tim
,
simple
,
direction_mark
,
other_tags_for_time
,
iter_
):
def
print_time
(
self
,
text
,
kind
,
tim
,
direction_mark
,
other_tags_for_time
,
iter_
):
local_tim
=
time
.
localtime
(
tim
)
buffer_
=
self
.
tv
.
get_buffer
()
current_print_time
=
app
.
config
.
get
(
'print_time'
)
if
current_print_time
==
'always'
and
not
simple
:
if
current_print_time
==
'always'
:
timestamp_str
=
self
.
get_time_to_show
(
local_tim
,
direction_mark
)
timestamp
=
time
.
strftime
(
timestamp_str
,
local_tim
)
timestamp
=
direction_mark
+
timestamp
+
direction_mark
...
...
@@ -1203,7 +1203,7 @@ class ConversationTextview(GObject.GObject):
*
other_tags_for_time
)
else
:
buffer_
.
insert
(
iter_
,
timestamp
)
elif
current_print_time
==
'sometimes'
and
not
simple
:
elif
current_print_time
==
'sometimes'
:
every_foo_seconds
=
60
*
app
.
config
.
get
(
'print_ichat_every_foo_minutes'
)
seconds_passed
=
tim
-
self
.
last_time_printout
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment