diff options
| -rw-r--r-- | plugins/exec.py | 4 | ||||
| -rw-r--r-- | poezio/plugin.py | 2 | ||||
| -rw-r--r-- | poezio/plugin_manager.py | 2 | ||||
| -rw-r--r-- | poezio/tabs/basetabs.py | 2 | ||||
| -rw-r--r-- | poezio/tabs/bookmarkstab.py | 1 | ||||
| -rw-r--r-- | poezio/tabs/rostertab.py | 10 |
6 files changed, 10 insertions, 11 deletions
diff --git a/plugins/exec.py b/plugins/exec.py index 9217bc8a..f9894f53 100644 --- a/plugins/exec.py +++ b/plugins/exec.py @@ -65,10 +65,10 @@ class Plugin(BasePlugin): result = process.communicate()[0].decode('utf-8') if arg and arg == '-o': if not self.api.send_message('%s' % (result,)): - self.api.information('Cannot send result (%s), this is not a conversation tab' % result) + self.api.information('Cannot send result (%s), this is not a conversation tab' % result, 'Error') elif arg and arg == '-O': if not self.api.send_message('%s:\n%s' % (command, result)): - self.api.information('Cannot send result (%s), this is not a conversation tab' % result) + self.api.information('Cannot send result (%s), this is not a conversation tab' % result, 'Error') else: self.api.information('%s:\n%s' % (command, result), 'Info') return diff --git a/poezio/plugin.py b/poezio/plugin.py index 59e4f490..c8bffc95 100644 --- a/poezio/plugin.py +++ b/poezio/plugin.py @@ -81,7 +81,7 @@ class SafetyMetaclass(type): raise elif SafetyMetaclass.core: log.error('Error in a plugin', exc_info=True) - SafetyMetaclass.core.information(traceback.format_exc()) + SafetyMetaclass.core.information(traceback.format_exc(), 'Error') return None return helper diff --git a/poezio/plugin_manager.py b/poezio/plugin_manager.py index bebf2133..f20797f0 100644 --- a/poezio/plugin_manager.py +++ b/poezio/plugin_manager.py @@ -68,7 +68,7 @@ class PluginManager(object): module = None loader = self.finder.find_module(name, self.load_path) if not loader: - self.core.information('Could not find plugin: %s' % name) + self.core.information('Could not find plugin: %s' % name, 'Error') return module = loader.load_module() except Exception as e: diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py index 02af159a..95846ef4 100644 --- a/poezio/tabs/basetabs.py +++ b/poezio/tabs/basetabs.py @@ -639,7 +639,7 @@ class ChatTab(Tab): self.core.command.help('correct') return if not self.last_sent_message: - self.core.information('There is no message to correct.') + self.core.information('There is no message to correct.', 'Error') return self.command_say(line, correct=True) diff --git a/poezio/tabs/bookmarkstab.py b/poezio/tabs/bookmarkstab.py index e11f8aba..cdb983bb 100644 --- a/poezio/tabs/bookmarkstab.py +++ b/poezio/tabs/bookmarkstab.py @@ -89,7 +89,6 @@ class BookmarksTab(Tab): self.core.information('Bookmarks saved.', 'Info') else: self.core.information('Remote bookmarks not saved.', 'Error') - log.debug('alerte %s', str(stanza_storage(self.bookmarks.bookmarks))) self.bookmarks.save(self.core.xmpp, callback=send_cb) self.core.close_tab(self) return True diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py index 2d311012..2720bf7f 100644 --- a/poezio/tabs/rostertab.py +++ b/poezio/tabs/rostertab.py @@ -601,12 +601,12 @@ class RosterInfoTab(Tab): if isinstance(item, Contact): jid = item.bare_jid else: - self.core.information('No subscription to deny') + self.core.information('No subscription to deny', 'Warning') return else: jid = safeJID(args[0]).bare if not jid in [jid for jid in roster.jids()]: - self.core.information('No subscription to deny') + self.core.information('No subscription to deny', 'Warning') return contact = roster[jid] @@ -759,7 +759,7 @@ class RosterInfoTab(Tab): if iq: roster.update_contact_groups(contact) else: - self.core.information('The group could not be set') + self.core.information('The group could not be set', 'Error') log.debug('Error in groupmove:\n%s', iq) self.core.xmpp.update_roster(jid, name=name, groups=new_groups, @@ -819,7 +819,7 @@ class RosterInfoTab(Tab): if isinstance(item, Contact): jid = item.bare_jid else: - self.core.information('No roster item to remove') + self.core.information('No roster item to remove', 'Error') return roster.remove(jid) del roster[jid] @@ -955,7 +955,7 @@ class RosterInfoTab(Tab): if isinstance(item, Contact): jid = item.bare_jid else: - self.core.information('No subscription to accept') + self.core.information('No subscription to accept', 'Warning') return else: jid = safeJID(args[0]).bare |