Changeset db4cd40

Timestamp:

2009-10-11T12:22:23Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

0f7ee7e5

Parents:

4f103ea

Message:

Some valgrind cleaning/type safety fixes.

File:

• protocols/purple/purple.c (modified) (4 diffs)

protocols/purple/purple.c

@@ -85 +85 @@
 static void purple_logout( struct im_connection *ic )
 {
+        PurpleAccount *pa = ic->proto_data;
+        
+        purple_account_set_enabled( pa, "BitlBee", FALSE );
         purple_connections = g_slist_remove( purple_connections, ic );
+        purple_account_destroy( pa );
 }
 
@@ -198 +202 @@
 {
         PurpleBuddy *bud = (PurpleBuddy*) node;
-        struct im_connection *ic = purple_ic_by_pa( bud->account );
-        
-        if( node->type == PURPLE_BLIST_BUDDY_NODE && ic != NULL )
-        {
+        
+        if( node->type == PURPLE_BLIST_BUDDY_NODE )
+        {
+                struct im_connection *ic = purple_ic_by_pa( bud->account );
+                
+                if( ic == NULL )
+                        return;
+                
                 imcb_add_buddy( ic, bud->name, NULL );
                 if( bud->server_alias )
@@ -211 +219 @@
 {
         PurpleBuddy *bud = (PurpleBuddy*) node;
-        struct im_connection *ic = purple_ic_by_pa( bud->account );
-        
-        if( node->type == PURPLE_BLIST_BUDDY_NODE && ic != NULL  )
-        {
+        
+        if( node->type == PURPLE_BLIST_BUDDY_NODE )
+        {
+                struct im_connection *ic = purple_ic_by_pa( bud->account );
                 PurpleStatus *as;
                 int flags = 0;
                 
+                if( ic == NULL )
+                        return;
+                
                 flags |= purple_presence_is_online( bud->presence ) ? OPT_LOGGED_IN : 0;
                 flags |= purple_presence_is_available( bud->presence ) ? 0 : OPT_AWAY;
@@ -231 +242 @@
 {
         PurpleBuddy *bud = (PurpleBuddy*) node;
-        struct im_connection *ic = purple_ic_by_pa( bud->account );
-        
-        if( node->type == PURPLE_BLIST_BUDDY_NODE && ic != NULL  )
-        {
+        
+        if( node->type == PURPLE_BLIST_BUDDY_NODE )
+        {
+                struct im_connection *ic = purple_ic_by_pa( bud->account );
+                
+                if( ic == NULL )
+                        return;
+                
                 imcb_remove_buddy( ic, bud->name, NULL );
         }