diff options
| author | mathieui <mathieui@mathieui.net> | 2018-12-16 19:08:05 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2018-12-16 19:08:05 +0100 |
| commit | f034f7d0000560711070053e7e0d51193e61d12c (patch) | |
| tree | 46aca5d7e802154be61c4ad6795e5da9863fedca /plugins | |
| parent | 8a23706b72a0f19405581e20c132fb442a960250 (diff) | |
| parent | d619e0c5ff9c896c0eb35b24cb28f79b150595fe (diff) | |
| download | poezio-f034f7d0000560711070053e7e0d51193e61d12c.tar.gz poezio-f034f7d0000560711070053e7e0d51193e61d12c.tar.bz2 poezio-f034f7d0000560711070053e7e0d51193e61d12c.tar.xz poezio-f034f7d0000560711070053e7e0d51193e61d12c.zip | |
Merge branch 'master' into 'master'
self-ping: do not /cycle on timeout, log only
See merge request poezio/poezio!16
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/embed.py | 2 | ||||
| -rw-r--r-- | plugins/upload.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/embed.py b/plugins/embed.py index 726b1eb2..0cdc41d2 100644 --- a/plugins/embed.py +++ b/plugins/embed.py @@ -20,7 +20,7 @@ from poezio.theming import get_theme class Plugin(BasePlugin): def init(self): - for tab_t in [tabs.MucTab, tabs.ConversationTab, tabs.PrivateTab]: + for tab_t in [tabs.MucTab, tabs.StaticConversationTab, tabs.DynamicConversationTab, tabs.PrivateTab]: self.api.add_tab_command( tab_t, 'embed', diff --git a/plugins/upload.py b/plugins/upload.py index db8615c2..7e25070e 100644 --- a/plugins/upload.py +++ b/plugins/upload.py @@ -33,7 +33,7 @@ class Plugin(BasePlugin): def init(self): if not self.core.xmpp['xep_0363']: raise Exception('slixmpp XEP-0363 plugin failed to load') - for _class in (tabs.PrivateTab, tabs.ConversationTab, tabs.MucTab): + for _class in (tabs.PrivateTab, tabs.StaticConversationTab, tabs.DynamicConversationTab, tabs.MucTab): self.api.add_tab_command( _class, 'upload', |