Merge pull request #464 from csmith/event-refactoring

Support for core changes.
DMDirc · Feb 24, 2016 · 49c2859 · 49c2859
2 parents ab2b512 + b6e76b8
commit 49c2859
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/ui_swing/src/com/dmdirc/addons/ui_swing/components/AwayLabel.java b/ui_swing/src/com/dmdirc/addons/ui_swing/components/AwayLabel.java
@@ -90,7 +90,7 @@ private void updateVisibility(final boolean away) {
 
     @Handler(invocation = EdtHandlerInvocation.class)
     public void windowClosing(final FrameClosingEvent event) {
-        if (event.getContainer().equals(container)) {
+        if (event.getSource().equals(container)) {
             container.getConfigManager().getBinder().unbind(this);
             container.getEventBus().unsubscribe(this);
         }

diff --git a/ui_swing/src/com/dmdirc/addons/ui_swing/components/TypingLabel.java b/ui_swing/src/com/dmdirc/addons/ui_swing/components/TypingLabel.java
@@ -91,7 +91,7 @@ public void componentRemoved(final FrameComponentRemovedEvent event) {
 
     @Handler(invocation = EdtHandlerInvocation.class)
     public void windowClosing(final FrameClosingEvent event) {
-        if (event.getContainer().equals(container)) {
+        if (event.getSource().equals(container)) {
             container.getConfigManager().getBinder().unbind(this);
             container.getEventBus().unsubscribe(this);
         }

diff --git a/ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java b/ui_swing/src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java
@@ -486,7 +486,7 @@ private void updateBackgroundColour(final String value) {
 
     @Handler(invocation = EdtHandlerInvocation.class)
     public void windowClosing(final FrameClosingEvent event) {
-        if (event.getContainer().equals(getContainer())) {
+        if (event.getSource().equals(getContainer())) {
             if (popout) {
                 setPopout(false);
             }