Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv464/src/protocols/jabber
Modified Files:
jabber.c
Log Message:
Better support for Jabber resources by Jim Seymour
Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- jabber.c 15 Mar 2002 00:56:15 -0000 1.36
+++ jabber.c 15 Mar 2002 20:09:13 -0000 1.37
@@ -1089,6 +1089,9 @@
}
+ /*
+ * Add or remove a buddy?
+ */
if (BUD_SUB_TO_PEND(sub, ask) || BUD_SUBD_TO(sub, ask)) {
if ((b = find_buddy(GJ_GC(gjc), buddyname)) == NULL) {
debug_printf("adding buddy [4]: %s\n", buddyname);
@@ -1096,12 +1099,6 @@
name ? name : buddyname);
do_export(GJ_GC(gjc));
}
- /*
- * TBD: this is what we *would* do if we could. But the
- * remove_buddy() code doesn't update the UI. And if the
- * user selects and tries to remove a buddy already removed
- * via here: *ka-boom*!
- *
} else if (BUD_USUB_TO_PEND(sub, ask) || BUD_USUBD_TO(sub, ask) || !strcasecmp(sub, "remove")) {
if ((b = find_buddy(GJ_GC(gjc), buddyname)) != NULL) {
struct group *group;
@@ -1112,7 +1109,6 @@
remove_buddy(GJ_GC(gjc), group, b);
do_export(GJ_GC(gjc));
}
- */
}
g_free(buddyname);
|
