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
7c45943d
Commit
7c45943d
authored
6 years ago
by
Philipp Hörist
Browse files
Options
Downloads
Patches
Plain Diff
Check if path is None
parent
45e03c25
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
gajim/groupchat_control.py
+21
-10
21 additions, 10 deletions
gajim/groupchat_control.py
with
21 additions
and
10 deletions
gajim/groupchat_control.py
+
21
−
10
View file @
7c45943d
...
@@ -23,16 +23,23 @@
...
@@ -23,16 +23,23 @@
# You should have received a copy of the GNU General Public License
# You should have received a copy of the GNU General Public License
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
# along with Gajim. If not, see <http://www.gnu.org/licenses/>.
from
typing
import
Optional
import
time
import
time
import
locale
import
locale
import
base64
import
base64
import
logging
from
enum
import
IntEnum
,
unique
import
nbxmpp
from
gi.repository
import
Gtk
from
gi.repository
import
Gtk
from
gi.repository
import
Gdk
from
gi.repository
import
Gdk
from
gi.repository
import
GdkPixbuf
from
gi.repository
import
GdkPixbuf
from
gi.repository
import
Pango
from
gi.repository
import
Pango
from
gi.repository
import
GLib
from
gi.repository
import
GLib
from
gi.repository
import
Gio
from
gi.repository
import
Gio
from
gajim
import
gtkgui_helpers
from
gajim
import
gtkgui_helpers
from
gajim
import
gui_menu_builder
from
gajim
import
gui_menu_builder
from
gajim
import
message_control
from
gajim
import
message_control
...
@@ -44,10 +51,6 @@ from gajim import adhoc_commands
...
@@ -44,10 +51,6 @@ from gajim import adhoc_commands
from
gajim.gtk
import
AddNewContactWindow
from
gajim.gtk
import
AddNewContactWindow
from
gajim.common.const
import
AvatarSize
from
gajim.common.const
import
AvatarSize
from
gajim.common.caps_cache
import
muc_caps_cache
from
gajim.common.caps_cache
import
muc_caps_cache
import
nbxmpp
from
enum
import
IntEnum
,
unique
from
gajim.common
import
events
from
gajim.common
import
events
from
gajim.common
import
app
from
gajim.common
import
app
from
gajim.common
import
helpers
from
gajim.common
import
helpers
...
@@ -56,7 +59,6 @@ from gajim.common import ged
...
@@ -56,7 +59,6 @@ from gajim.common import ged
from
gajim.common
import
i18n
from
gajim.common
import
i18n
from
gajim.common
import
contacts
from
gajim.common
import
contacts
from
gajim.common.const
import
StyleAttr
from
gajim.common.const
import
StyleAttr
from
gajim.chat_control
import
ChatControl
from
gajim.chat_control
import
ChatControl
from
gajim.chat_control_base
import
ChatControlBase
from
gajim.chat_control_base
import
ChatControlBase
from
gajim.gtk.filechoosers
import
AvatarChooserDialog
from
gajim.gtk.filechoosers
import
AvatarChooserDialog
...
@@ -72,7 +74,6 @@ from gajim.command_system.implementation.hosts import GroupChatCommands
...
@@ -72,7 +74,6 @@ from gajim.command_system.implementation.hosts import GroupChatCommands
from
gajim.common.connection_handlers_events
import
GcMessageOutgoingEvent
from
gajim.common.connection_handlers_events
import
GcMessageOutgoingEvent
import
logging
log
=
logging
.
getLogger
(
'
gajim.groupchat_control
'
)
log
=
logging
.
getLogger
(
'
gajim.groupchat_control
'
)
@unique
@unique
...
@@ -1299,13 +1300,18 @@ class GroupchatControl(ChatControlBase):
...
@@ -1299,13 +1300,18 @@ class GroupchatControl(ChatControlBase):
if
contact
:
if
contact
:
app
.
interface
.
roster
.
draw_contact
(
self
.
room_jid
,
self
.
account
)
app
.
interface
.
roster
.
draw_contact
(
self
.
room_jid
,
self
.
account
)
def
get_contact_iter
(
self
,
nick
)
:
def
get_contact_iter
(
self
,
nick
:
str
)
->
Optional
[
Gtk
.
TreeIter
]
:
try
:
try
:
ref
=
self
.
_contact_refs
[
nick
]
ref
=
self
.
_contact_refs
[
nick
]
return
self
.
model
.
get_iter
(
ref
.
get_path
())
except
KeyError
:
except
KeyError
:
return
None
return
None
path
=
ref
.
get_path
()
if
path
is
None
:
return
None
return
self
.
model
.
get_iter
(
path
)
def
print_old_conversation
(
self
,
text
,
contact
=
''
,
tim
=
None
,
xhtml
=
None
,
def
print_old_conversation
(
self
,
text
,
contact
=
''
,
tim
=
None
,
xhtml
=
None
,
displaymarking
=
None
,
msg_stanza_id
=
None
,
encrypted
=
None
,
additional_data
=
None
):
displaymarking
=
None
,
msg_stanza_id
=
None
,
encrypted
=
None
,
additional_data
=
None
):
if
additional_data
is
None
:
if
additional_data
is
None
:
...
@@ -2092,13 +2098,18 @@ class GroupchatControl(ChatControlBase):
...
@@ -2092,13 +2098,18 @@ class GroupchatControl(ChatControlBase):
self
.
draw_banner_text
()
self
.
draw_banner_text
()
return
iter_
return
iter_
def
get_role_iter
(
self
,
role
)
:
def
get_role_iter
(
self
,
role
:
str
)
->
Optional
[
Gtk
.
TreeIter
]
:
try
:
try
:
ref
=
self
.
_role_refs
[
role
]
ref
=
self
.
_role_refs
[
role
]
return
self
.
model
.
get_iter
(
ref
.
get_path
())
except
KeyError
:
except
KeyError
:
return
None
return
None
path
=
ref
.
get_path
()
if
path
is
None
:
return
None
return
self
.
model
.
get_iter
(
path
)
def
remove_contact
(
self
,
nick
):
def
remove_contact
(
self
,
nick
):
"""
"""
Remove a user from the contacts_list
Remove a user from the contacts_list
...
...
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