Changeset 9c9b37c

Timestamp:

2007-07-01T19:58:23Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c377417

Parents:

b9f8b87

Message:

Keeping an original (not normalized) copy of the user's nickname. This
fixes a bug reported by James Teh in the monster ticket #20. There's no
proper garbage collection yet in the Jabber conference code, really have
to do that soon. :-(

Location:

protocols/jabber

Files:

• conference.c (modified) (2 diffs)
• jabber.h (modified) (1 diff)
• presence.c (modified) (1 diff)

protocols/jabber/conference.c

@@ -54 +54 @@
                 return NULL;
         }
-        g_free( roomjid );
+        
+        /* roomjid isn't normalized yet, and we need an original version
+           of the nick to send a proper presence update. */
+        jc->my_full_jid = roomjid;
         
         c = imcb_chat_new( ic, room );
@@ -89 +92 @@
         node = xt_new_node( "x", NULL, NULL );
         xt_add_attr( node, "xmlns", XMLNS_MUC );
-        node = jabber_make_packet( "presence", "unavailable", jc->me->full_jid, node );
+        node = jabber_make_packet( "presence", "unavailable", jc->my_full_jid, node );
         
         if( !jabber_write_packet( ic, node ) )

protocols/jabber/jabber.h

@@ -119 +119 @@
         int flags;
         char *name;
+        char *my_full_jid; /* Separate copy because of case sensitivity. */
         struct jabber_buddy *me;
 };

protocols/jabber/presence.c

@@ -195 +195 @@
                 struct jabber_chat *jc = c->data;
                 
-                xt_add_attr( node, "to", jc->me->full_jid );
+                xt_add_attr( node, "to", jc->my_full_jid );
                 st = jabber_write_packet( ic, node );
         }