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];
}
}
@implementation JubGtkRosterUI
-- initWithClient: (JubChatClient*)client_
+- initWithClient: (JubChatClient*)client
{
self = [super init];
GtkTreeView *roster_view;
GtkBuilder *builder;
- groupMap = [[OFMapTable alloc]
+ _groupMap = [[OFMapTable alloc]
initWithKeyFunctions: keyFunctions
valueFunctions: rowRefFunctions];
- contactMap = [[OFMutableDictionary alloc] init];
- chatMap = [[OFMutableDictionary alloc] init];
- client = [client_ retain];
+ _contactMap = [[OFMutableDictionary alloc] init];
+ _client = [client retain];
- [client.contactManager addDelegate: self];
+ [_client.contactManager addDelegate: self];
builder = gtk_builder_new();
gtk_builder_add_from_file(builder, "data/gtk/roster.ui", NULL);
gtk_builder_connect_signals(builder, NULL);
- roster_window =
+ _roster_window =
GTK_WIDGET(gtk_builder_get_object(builder, "RosterWindow"));
- gtk_widget_show(roster_window);
+ gtk_widget_show(_roster_window);
- roster_model = GTK_TREE_STORE(gtk_builder_get_object(builder,
+ _roster_model = GTK_TREE_STORE(gtk_builder_get_object(builder,
"RosterTreeStore"));
- roster_filter = GTK_TREE_MODEL_FILTER(
+ _roster_filter = GTK_TREE_MODEL_FILTER(
gtk_builder_get_object(builder, "RosterTreeModelFilter"));
- gtk_tree_model_filter_set_visible_func(roster_filter,
+ gtk_tree_model_filter_set_visible_func(_roster_filter,
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,
+ _presence_combo = GTK_COMBO_BOX(gtk_builder_get_object(builder,
"PresenceComboBox"));
- presence_combo_changed_handler_id =
- g_signal_connect(presence_combo, "changed",
+ _presence_combo_changed_handler_id =
+ g_signal_connect(_presence_combo, "changed",
G_CALLBACK(presence_changed), client.connection);
g_object_unref(G_OBJECT(builder));
- (void)dealloc
{
- [client.contactManager removeDelegate: self];
- [groupMap release];
- [contactMap release];
- [chatMap release];
- [client release];
+ [_client.contactManager removeDelegate: self];
+ [_groupMap release];
+ [_contactMap release];
+ [_client release];
- gtk_widget_destroy(roster_window);
+ 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]];
}
OFString *bareJID = [item.JID bareJID];
OFMapTable *contactRows;
- if (!(contactRows = [contactMap objectForKey: bareJID])) {
+ if (!(contactRows = [_contactMap objectForKey: bareJID])) {
contactRows = [OFMapTable
mapTableWithKeyFunctions: keyFunctions
valueFunctions: rowRefFunctions];
- [contactMap setObject: contactRows
- forKey: bareJID];
+ [_contactMap setObject: contactRows
+ forKey: bareJID];
}
- group_ref = [groupMap valueForKey: group];
+ group_ref = [_groupMap valueForKey: group];
if (!group_ref) {
// Create new group row
- gtk_tree_store_append(roster_model, &group_iter, NULL);
- gtk_tree_store_set(roster_model, &group_iter,
+ gtk_tree_store_append(_roster_model, &group_iter, NULL);
+ gtk_tree_store_set(_roster_model, &group_iter,
0, [group UTF8String], -1);
group_path = gtk_tree_model_get_path(GTK_TREE_MODEL(
- roster_model), &group_iter);
+ _roster_model), &group_iter);
group_ref = gtk_tree_row_reference_new(GTK_TREE_MODEL(
- roster_model), group_path);
+ _roster_model), group_path);
- [groupMap setValue: group_ref
- forKey: group];
+ [_groupMap setValue: group_ref
+ forKey: group];
} else {
// Get iter for existing group row
group_path = gtk_tree_row_reference_get_path(group_ref);
- gtk_tree_model_get_iter(GTK_TREE_MODEL(roster_model),
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(_roster_model),
&group_iter, group_path);
}
gtk_tree_path_free(group_path);
// Create new contact row
- gtk_tree_store_append(roster_model, &contact_iter, &group_iter);
+ gtk_tree_store_append(_roster_model, &contact_iter,
+ &group_iter);
if (item.name)
- gtk_tree_store_set(roster_model, &contact_iter,
+ gtk_tree_store_set(_roster_model, &contact_iter,
0, [item.name UTF8String],
1, [bareJID UTF8String],
2, "unavailable", -1);
- else
- gtk_tree_store_set(roster_model, &contact_iter,
+ else if (item.JID.node)
+ gtk_tree_store_set(_roster_model, &contact_iter,
0, [item.JID.node UTF8String],
1, [bareJID UTF8String],
2, "unavailable", -1);
+ else
+ gtk_tree_store_set(_roster_model, &contact_iter,
+ 0, [item.JID.domain UTF8String],
+ 1, [bareJID UTF8String],
+ 2, "unavailable", -1);
contact_path = gtk_tree_model_get_path(GTK_TREE_MODEL(
- roster_model), &contact_iter);
+ _roster_model), &contact_iter);
contact_ref = gtk_tree_row_reference_new(GTK_TREE_MODEL(
- roster_model), contact_path);
+ _roster_model), contact_path);
gtk_tree_path_free(contact_path);
GtkTreePath *contact_path, *group_path;
GtkTreeRowReference *contact_ref, *group_ref;
OFString *bareJID = [item.JID bareJID];
- OFMapTable *contactRows = [contactMap objectForKey: bareJID];
+ OFMapTable *contactRows = [_contactMap objectForKey: bareJID];
contact_ref = [contactRows valueForKey: group];
contact_path = gtk_tree_row_reference_get_path(contact_ref);
- gtk_tree_model_get_iter(GTK_TREE_MODEL(roster_model),
+ 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);
+ gtk_tree_store_remove(_roster_model, &contact_iter);
- group_ref = [groupMap valueForKey: group];
+ group_ref = [_groupMap valueForKey: group];
group_path = gtk_tree_row_reference_get_path(group_ref);
- gtk_tree_model_get_iter(GTK_TREE_MODEL(roster_model),
+ gtk_tree_model_get_iter(GTK_TREE_MODEL(_roster_model),
&group_iter, group_path);
- if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(roster_model),
- &group_iter)) {
- gtk_tree_store_remove(roster_model, &group_iter);
- [groupMap removeValueForKey: group];
+ if (!gtk_tree_model_iter_has_child(GTK_TREE_MODEL(
+ _roster_model), &group_iter)) {
+ gtk_tree_store_remove(_roster_model, &group_iter);
+ [_groupMap removeValueForKey: group];
}
gtk_tree_path_free(group_path);
[contactRows removeValueForKey: group];
if([contactRows count] == 0)
- [contactMap removeObjectForKey: bareJID];
+ [_contactMap removeObjectForKey: bareJID];
});
}
- (void)contact: (XMPPContact*)contact
didSendPresence: (XMPPPresence*)presence
{
+ OFDictionary *allPresences = [contact presences];
+ XMPPPresence *highPresence = [[[allPresences allObjects] sortedArray]
+ lastObject];
+ OFMutableString *tooltip =
+ [OFMutableString stringWithString: @"<b>Resources:</b>"];
+
+ [allPresences enumerateKeysAndObjectsUsingBlock:
+ ^(OFString *resource, XMPPPresence *pres, BOOL *stop) {
+ [tooltip appendString: @"\n"];
+ [tooltip appendString: resource];
+ if ([pres.type isEqual: @"available"]) {
+ if (pres.show != nil)
+ [tooltip appendFormat: @" (%@)", pres.show];
+ else
+ [tooltip appendString: @" (available)"];
+ } else
+ [tooltip appendString: @" (unavailable)"];
+
+ if (pres.status)
+ [tooltip appendFormat: @": <i>%@</i>", pres.status];
+ }];
+
g_idle_add_block(^{
GtkTreeIter iter;
GtkTreePath *path;
GtkTreeRowReference *ref;
OFString *bareJID = [contact.rosterItem.JID bareJID];
- OFMapTable *contactRows = [contactMap objectForKey: 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),
+ 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);
+ if ([highPresence.type isEqual: @"available"]) {
+ if (highPresence.show != nil)
+ gtk_tree_store_set(_roster_model, &iter,
+ 2, [highPresence.show UTF8String],
+ -1);
else
- gtk_tree_store_set(roster_model, &iter,
+ gtk_tree_store_set(_roster_model, &iter,
2, "available", -1);
- else if ([presence.type isEqual: @"unavailable"])
- gtk_tree_store_set(roster_model, &iter,
+ } else
+ gtk_tree_store_set(_roster_model, &iter,
2, "unavailable", -1);
+
+ gtk_tree_store_set(_roster_model, &iter,
+ 3, [tooltip UTF8String], -1);
}
- gtk_tree_model_filter_refilter(roster_filter);
+ gtk_tree_model_filter_refilter(_roster_filter);
});
}
g_idle_add_block(^{
// Block the PresenceComboBox's changed handler, so it doesn't
// fire and resend presence
- g_signal_handler_block(presence_combo,
- presence_combo_changed_handler_id);
+ g_signal_handler_block(_presence_combo,
+ _presence_combo_changed_handler_id);
if ([presence.type isEqual: @"unavailable"])
- gtk_combo_box_set_active_id(presence_combo,
+ gtk_combo_box_set_active_id(_presence_combo,
"unavailable");
else if (show == nil)
- gtk_combo_box_set_active_id(presence_combo,
+ gtk_combo_box_set_active_id(_presence_combo,
"available");
else
- gtk_combo_box_set_active_id(presence_combo,
+ gtk_combo_box_set_active_id(_presence_combo,
[show UTF8String]);
// Unblock the changed handler
- g_signal_handler_unblock(presence_combo,
- presence_combo_changed_handler_id);
+ g_signal_handler_unblock(_presence_combo,
+ _presence_combo_changed_handler_id);
- gtk_widget_set_tooltip_markup(GTK_WIDGET(presence_combo),
+ gtk_widget_set_tooltip_markup(GTK_WIDGET(_presence_combo),
[tooltip UTF8String]);
});
}
projects / jubjub.git / blobdiff