Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gajim
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
eta
gajim
Commits
7d3bff5b
Commit
7d3bff5b
authored
16 years ago
by
Yann Leboulanger
Browse files
Options
Downloads
Patches
Plain Diff
update Contact instance in privateChatControl. see #4292
parent
b9db39e0
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
src/common/caps.py
+4
-0
4 additions, 0 deletions
src/common/caps.py
src/groupchat_control.py
+3
-0
3 additions, 0 deletions
src/groupchat_control.py
with
7 additions
and
0 deletions
src/common/caps.py
+
4
−
0
View file @
7d3bff5b
...
...
@@ -228,12 +228,14 @@ class ConnectionCaps(object):
# we will put these into proper Contact object and ask
# for disco... so that disco will learn how to interpret
# these caps
pm_ctrl
=
None
jid
=
helpers
.
get_full_jid_from_iq
(
presence
)
contact
=
gajim
.
contacts
.
get_contact_from_full_jid
(
self
.
name
,
jid
)
if
contact
is
None
:
room_jid
,
nick
=
gajim
.
get_room_and_nick_from_fjid
(
jid
)
contact
=
gajim
.
contacts
.
get_gc_contact
(
self
.
name
,
room_jid
,
nick
)
pm_ctrl
=
gajim
.
interface
.
msg_win_mgr
.
get_control
(
jid
,
self
.
name
)
if
contact
is
None
:
# TODO: a way to put contact not-in-roster
# into Contacts
...
...
@@ -267,6 +269,8 @@ class ConnectionCaps(object):
contact
.
caps_node
=
node
contact
.
caps_hash_method
=
hash_method
contact
.
caps_hash
=
hash
if
pm_ctrl
:
pm_ctrl
.
update_contact
()
def
_capsDiscoCB
(
self
,
jid
,
node
,
identities
,
features
,
dataforms
):
contact
=
gajim
.
contacts
.
get_contact_from_full_jid
(
self
.
name
,
jid
)
...
...
This diff is collapsed.
Click to expand it.
src/groupchat_control.py
+
3
−
0
View file @
7d3bff5b
...
...
@@ -162,6 +162,9 @@ class PrivateChatControl(ChatControl):
self
.
got_connected
()
ChatControl
.
update_ui
(
self
)
def
update_contact
(
self
):
self
.
contact
=
gajim
.
contacts
.
contact_from_gc_contact
(
self
.
gc_contact
)
class
GroupchatControl
(
ChatControlBase
):
TYPE_ID
=
message_control
.
TYPE_GC
...
...
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