1 files changed, 9 insertions, 9 deletions
diff --git a/poezio/events.py b/poezio/events.py
index 15ef3e35..97d77626 100644
--- a/poezio/events.py
+++ b/poezio/events.py
@@ -55,10 +55,11 @@ class EventHandler(object):
         if name not in self.events:
             return False
 
+        callbacks = self.events[name]
         if position >= 0:
-            self.events[name].insert(position, callback)
+            callbacks.insert(position, callback)
         else:
-            self.events[name].append(callback)
+            callbacks.append(callback)
 
         return True
 
@@ -77,11 +78,10 @@ class EventHandler(object):
         Remove the callback from the list of callbacks of the given event
         """
         if not name:
-            for event in self.events:
-                while callback in self.events[event]:
-                    self.events[event].remove(callback)
-            return True
+            for callbacks in self.events.values():
+                while callback in callbacks:
+                    callbacks.remove(callback)
         else:
-            if callback in self.events[name]:
-                self.events[name].remove(callback)
-
+            callbacks = self.events[name]
+            if callback in callbacks:
+                callbacks.remove(callback)