Changeset 9da0bbf

Timestamp:

2007-07-02T22:12:03Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

e900442

Parents:

5d7dc00

Message:

Added (and using) jabber_chat_free() for better memory management, fixed
channel name generation code in root_commands.c and fixed one memory leak
in jabber_buddy_remove_bare().

Files:

• protocols/jabber/conference.c (modified) (2 diffs)
• protocols/jabber/jabber.c (modified) (1 diff)
• protocols/jabber/jabber.h (modified) (1 diff)
• protocols/jabber/jabber_util.c (modified) (2 diffs)
• root_commands.c (modified) (1 diff)

protocols/jabber/conference.c

@@ -63 +63 @@
         
         return c;
+}
+
+void jabber_chat_free( struct groupchat *c )
+{
+        struct jabber_chat *jc = c->data;
+        
+        jabber_buddy_remove_bare( c->ic, jc->name );
+        
+        g_free( jc->my_full_jid );
+        g_free( jc->name );
+        g_free( jc );
+        
+        imcb_chat_free( c );
 }
 
@@ -192 +205 @@
                 
                 if( bud == jc->me )
-                {
-                        jabber_buddy_remove_bare( ic, jc->name );
-                        
-                        g_free( jc->name );
-                        g_free( jc );
-                        imcb_chat_free( chat );
-                }
+                        jabber_chat_free( chat );
         }
 }

protocols/jabber/jabber.c

@@ -198 +198 @@
         
         while( ic->groupchats )
-                imcb_chat_free( ic->groupchats );
+                jabber_chat_free( ic->groupchats );
         
         if( jd->r_inpa >= 0 )

protocols/jabber/jabber.h

@@ -220 +220 @@
 /* conference.c */
 struct groupchat *jabber_chat_join( struct im_connection *ic, char *room, char *nick, char *password );
+void jabber_chat_free( struct groupchat *c );
 int jabber_chat_msg( struct groupchat *ic, char *message, int flags );
 int jabber_chat_leave( struct groupchat *c, const char *reason );

protocols/jabber/jabber_util.c

@@ -542 +542 @@
    specified bare JID. Use this when removing someone from the contact
    list, for example. */
-int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid_ )
+int jabber_buddy_remove_bare( struct im_connection *ic, char *bare_jid )
 {
         struct jabber_data *jd = ic->proto_data;
         struct jabber_buddy *bud, *next;
-        char *bare_jid;
-        
-        if( strchr( bare_jid_, '/' ) )
+        
+        if( strchr( bare_jid, '/' ) )
                 return 0;
         
-        bare_jid = jabber_normalize( bare_jid_ );
-        
-        if( ( bud = g_hash_table_lookup( jd->buddies, bare_jid ) ) )
+        if( ( bud = jabber_buddy_by_jid( ic, bare_jid, GET_BUDDY_FIRST ) ) )
         {
                 /* Most important: Remove the hash reference. We don't know
                    this buddy anymore. */
                 g_hash_table_remove( jd->buddies, bud->bare_jid );
+                g_free( bud->bare_jid );
                 
                 /* Deallocate the linked list of resources. */
                 while( bud )
                 {
+                        /* ext_jid && anonymous means that this buddy is
+                           specific to one groupchat (the one we're
+                           currently cleaning up) so it can be deleted
+                           completely. */
+                        if( bud->ext_jid && bud->flags & JBFLAG_IS_ANONYMOUS )
+                                imcb_remove_buddy( ic, bud->ext_jid, NULL );
+                        
                         next = bud->next;
                         g_free( bud->ext_jid );
@@ -570 +575 @@
                 }
                 
-                g_free( bare_jid );
                 return 1;
         }
         else
         {
-                g_free( bare_jid );
                 return 0;
         }

root_commands.c

@@ -912 +912 @@
         if( cmd[3] )
         {
-                if( channel[0] != '#' && channel[0] != '&' )
+                if( cmd[3][0] != '#' && cmd[3][0] != '&' )
                         channel = g_strdup_printf( "&%s", cmd[3] );
                 else