static void roster_row_activated(GtkTreeView *tree_view, GtkTreePath *path,
GtkTreeViewColumn *column, gpointer data)
{
- JubGtkRosterUI *roster = data;
+ OFAutoreleasePool *pool;
+ XMPPContact *contact;
+ JubChatClient *client = data;
GtkTreeIter row_iter;
GtkTreeModel *tree_model;
gchar *jid_s;
- XMPPJID *jid;
- OFAutoreleasePool *pool;
+ OFString *jid;
tree_model = gtk_tree_view_get_model(tree_view);
gtk_tree_model_get_iter(tree_model, &row_iter, path);
if (!jid_s) return;
pool = [OFAutoreleasePool new];
- jid = [XMPPJID JIDWithString: [OFString stringWithUTF8String: jid_s]];
- [roster performSelectorOnMainThread: @selector(chatForJID:)
- withObject: jid
+ jid = [OFString stringWithUTF8String: jid_s];
+ contact = [client.contactManager.contacts objectForKey: jid];
+
+ [client performSelectorOnMainThread: @selector(chatForContact:)
+ withObject: contact
waitUntilDone: NO];
[pool release];
}
static gboolean filter_roster_by_presence(GtkTreeModel *model,
GtkTreeIter *iter, gpointer data)
{
- char *jid_s;
- OFString *jid;
- OFCountedSet *presences = data;
-
- gtk_tree_model_get(model, iter, 1, &jid_s, -1);
+ char *status;
+ gtk_tree_model_get(model, iter, 2, &status, -1);
- // Groups have no JID
- if (!jid_s)
+ // Groups have no status
+ if (!status)
return TRUE;
- jid = [[OFString alloc] initWithUTF8String: jid_s];
-
- g_free(jid_s);
-
- int num = [presences countForObject: jid];
- if (num) {
- [jid release];
- return TRUE;
- } else {
- [jid release];
+ if (!strcmp(status, "unavailable"))
return FALSE;
- }
+
+ return TRUE;
}
@implementation JubGtkRosterUI
initWithKeyFunctions: keyFunctions
valueFunctions: rowRefFunctions];
contactMap = [[OFMutableDictionary alloc] init];
- chatMap = [[OFMutableDictionary alloc] init];
- presences = [[OFCountedSet alloc] init];
client = [client_ retain];
[client.contactManager addDelegate: self];
gtk_builder_get_object(builder, "RosterTreeModelFilter"));
gtk_tree_model_filter_set_visible_func(roster_filter,
- filter_roster_by_presence, presences, NULL);
+ filter_roster_by_presence, NULL, NULL);
roster_view = GTK_TREE_VIEW(gtk_builder_get_object(builder,
"RosterTreeView"));
g_signal_connect(roster_view, "row_activated",
- G_CALLBACK(roster_row_activated), self);
+ G_CALLBACK(roster_row_activated), client);
presence_combo = GTK_COMBO_BOX(gtk_builder_get_object(builder,
"PresenceComboBox"));
[client.contactManager removeDelegate: self];
[groupMap release];
[contactMap release];
- [chatMap release];
- [presences release];
[client release];
gtk_widget_destroy(roster_window);
[super dealloc];
}
-// FIXME: This needs to move somewhere else
-- (JubGtkChatUI*)chatForJID: (XMPPJID*)jid
-{
- OFAutoreleasePool *pool = [OFAutoreleasePool new];
- JubGtkChatUI *chat =
- [chatMap objectForKey: [jid bareJID]];
- if (chat == nil) {
- OFString * title = [@"Chat with " stringByAppendingString:
- [jid bareJID]];
-
- chat = [[[JubGtkChatUI alloc]
- initWithTitle: title
- closeBlock: ^{
- [chatMap removeObjectForKey: [jid bareJID]];
- }
- sendBlock: ^(OFString *text) {
- XMPPMessage *msg =
- [XMPPMessage messageWithType: @"chat"];
- msg.to = jid;
- msg.body = text;
- [client.connection sendStanza: msg];
- }
- ] autorelease];
-
- [chatMap setObject: chat
- forKey: [jid bareJID]];
- }
-
- [pool release];
-
- return chat;
-}
-
- (void)contact: (XMPPContact*)contact
didSendMessage: (XMPPMessage*)message
{
if (message.body == nil || ![message.type isEqual: @"chat"])
return;
- JubGtkChatUI *chat = [self chatForJID: message.from];
+ id<JubChatUI> chat = [client chatForContact: contact];
[chat addMessage: message.body
sender: [message.from bareJID]];
}
if (item.name)
gtk_tree_store_set(roster_model, &contact_iter,
0, [item.name UTF8String],
- 1, [bareJID UTF8String], -1);
+ 1, [bareJID UTF8String],
+ 2, "unavailable", -1);
else
gtk_tree_store_set(roster_model, &contact_iter,
0, [item.JID.node UTF8String],
- 1, [bareJID UTF8String], -1);
+ 1, [bareJID UTF8String],
+ 2, "unavailable", -1);
contact_path = gtk_tree_model_get_path(GTK_TREE_MODEL(
roster_model), &contact_iter);
contact_path = gtk_tree_row_reference_get_path(contact_ref);
gtk_tree_model_get_iter(GTK_TREE_MODEL(roster_model),
&contact_iter, contact_path);
+ gtk_tree_path_free(contact_path);
gtk_tree_store_remove(roster_model, &contact_iter);
- (void)contact: (XMPPContact*)contact
didSendPresence: (XMPPPresence*)presence
{
- if ([presence.type isEqual: @"available"])
- [presences addObject: [presence.from bareJID]];
- else if ([presence.type isEqual: @"unavailable"])
- [presences removeObject: [presence.from bareJID]];
-
g_idle_add_block(^{
+ GtkTreeIter iter;
+ GtkTreePath *path;
+ GtkTreeRowReference *ref;
+ OFString *bareJID = [contact.rosterItem.JID bareJID];
+ OFMapTable *contactRows = [contactMap objectForKey: bareJID];
+
+ for (OFString *group in contact.rosterItem.groups) {
+ ref = [contactRows valueForKey: group];
+ path = gtk_tree_row_reference_get_path(ref);
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(roster_model),
+ &iter, path);
+ gtk_tree_path_free(path);
+
+ if ([presence.type isEqual: @"available"])
+ if (presence.show != nil)
+ gtk_tree_store_set(roster_model, &iter,
+ 2, [presence.show UTF8String], -1);
+ else
+ gtk_tree_store_set(roster_model, &iter,
+ 2, "available", -1);
+ else if ([presence.type isEqual: @"unavailable"])
+ gtk_tree_store_set(roster_model, &iter,
+ 2, "unavailable", -1);
+
+ gtk_tree_store_set(roster_model, &iter,
+ 3, [presence.status UTF8String], -1);
+ }
+
gtk_tree_model_filter_refilter(roster_filter);
});
}