Move adding messages to the ChatUI to JubChatClient

diff --git a/src/core/JubChatClient.h b/src/core/JubChatClient.h
index 79884f8ff6916613e79ab30d07e0ef27dc47cbb3..95bda4296d989aa396cadfd46d8c24bf4f90189b 100644 (file)
--- a/src/core/JubChatClient.h
+++ b/src/core/JubChatClient.h
@@ -5,7 +5,8 @@
 #import "JubChatUI.h"
 #import "JubConfig.h"
 
-@interface JubChatClient : OFObject <XMPPConnectionDelegate, XMPPRosterDelegate>
+@interface JubChatClient : OFObject
+    <XMPPConnectionDelegate, XMPPRosterDelegate, XMPPContactManagerDelegate>
 {
        OFMutableDictionary *_chatMap;
        XMPPConnection *_connection;

diff --git a/src/core/JubChatClient.m b/src/core/JubChatClient.m
index 9acdf3935addec8aed8df165bcb5630eb0208893..77a4791541806bff07e079e3ecf01b7f4f26a1ae 100644 (file)
--- a/src/core/JubChatClient.m
+++ b/src/core/JubChatClient.m
@@ -27,6 +27,7 @@
                _contactManager = [[XMPPContactManager alloc]
                    initWithConnection: _connection
                                roster: _roster];
+               [_contactManager addDelegate: self];
 
                _streamManagement = [[XMPPStreamManagement alloc]
                    initWithConnection: _connection];
@@ -42,6 +43,10 @@
 
 - (void)dealloc
 {
+       [_roster removeDelegate: self];
+       [_contactManager removeDelegate: self];
+       [_connection removeDelegate: self];
+
        [_roster release];
        [_contactManager release];
        [_streamManagement release];
@@ -103,6 +108,17 @@
        }
 }
 
+-  (void)contact: (XMPPContact*)contact
+  didSendMessage: (XMPPMessage*)message
+{
+       if (message.body == nil || ![message.type isEqual: @"chat"])
+               return;
+
+       id<JubChatUI> chat = [self chatForContact: contact];
+       [chat addMessage: message.body
+                 sender: [message.from bareJID]];
+}
+
 - (void)rosterWasReceived: (XMPPRoster*)roster
 {
        XMPPPresence *pres = [XMPPPresence presence];

diff --git a/src/gui/gtk/JubGtkRosterUI.m b/src/gui/gtk/JubGtkRosterUI.m
index 227837dae7f63a979c634ea90a964656361017ca..ac74a33aae1e44f23041bb4cf49886a4112a9691 100644 (file)
--- a/src/gui/gtk/JubGtkRosterUI.m
+++ b/src/gui/gtk/JubGtkRosterUI.m
@@ -141,17 +141,6 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model,
        [super dealloc];
 }
 
--  (void)contact: (XMPPContact*)contact
-  didSendMessage: (XMPPMessage*)message
-{
-       if (message.body == nil || ![message.type isEqual: @"chat"])
-               return;
-
-       id<JubChatUI> chat = [_client chatForContact: contact];
-       [chat addMessage: message.body
-                 sender: [message.from bareJID]];
-}
-
 /* Roster Delegate methods */
 - (void)Jub_addRosterItem: (XMPPRosterItem*)item
                    group: (OFString*)group