Update to ObjFW changes

[jubjub.git] / src / gui / gtk / JubGtkRosterUI.m

diff --git a/src/gui/gtk/JubGtkRosterUI.m b/src/gui/gtk/JubGtkRosterUI.m
index 227837dae7f63a979c634ea90a964656361017ca..a805adf5129c80ae270688fbaa02271addac75d7 100644 (file)
--- a/src/gui/gtk/JubGtkRosterUI.m
+++ b/src/gui/gtk/JubGtkRosterUI.m
@@ -37,21 +37,11 @@ static void roster_row_activated(GtkTreeView *tree_view, GtkTreePath *path,
 
 static void presence_changed(GtkComboBox *combo_box, gpointer data)
 {
-       XMPPPresence *pres;
-       XMPPConnection *connection = data;
+       JubChatClient *client = data;
        OFAutoreleasePool *pool = [OFAutoreleasePool new];
-
        const char *status = gtk_combo_box_get_active_id(combo_box);
 
-       if (!strcmp(status, "unavailable"))
-               pres = [XMPPPresence presenceWithType: @"unavailable"];
-       else {
-               pres = [XMPPPresence presence];
-               if (strcmp(status, "available"))
-                       [pres setShow: @(status)];
-       }
-
-       [connection sendStanza: pres];
+       [client sendPresenceWithStatus: @(status)];
 
        [pool release];
 }
@@ -118,7 +108,7 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model,
 
                _presence_combo_changed_handler_id =
                    g_signal_connect(_presence_combo, "changed",
-                       G_CALLBACK(presence_changed), client.connection);
+                       G_CALLBACK(presence_changed), client);
 
                g_object_unref(G_OBJECT(builder));
        } @catch (id e) {
@@ -141,17 +131,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
@@ -332,7 +311,7 @@ static gboolean filter_roster_by_presence(GtkTreeModel *model,
            [OFMutableString stringWithString: @"<b>Resources:</b>"];
 
        [allPresences enumerateKeysAndObjectsUsingBlock:
-           ^(OFString *resource, XMPPPresence *pres, BOOL *stop) {
+           ^(OFString *resource, XMPPPresence *pres, bool *stop) {
                [tooltip appendString: @"\n"];
                [tooltip appendString: resource];
                if ([pres.type isEqual: @"available"]) {