Changeset e8a6211 for protocols/msn

Timestamp:

2006-10-22T17:00:15Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f0071b7

Parents:

66f783f (diff), 6237ded (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from main tree.

File:

• protocols/msn/msn.c (modified) (3 diffs)

protocols/msn/msn.c

@@ -42 +42 @@
         struct msn_data *md = g_new0( struct msn_data, 1 );
         
-        set_login_progress( gc, 1, "Connecting" );
-        
         gc->proto_data = md;
         md->fd = -1;
@@ -54 +52 @@
         }
         
+        set_login_progress( gc, 1, "Connecting" );
+        
         md->fd = proxy_connect( "messenger.hotmail.com", 1863, msn_ns_connected, gc );
         if( md->fd < 0 )
@@ -59 +59 @@
                 hide_login_progress( gc, "Could not connect to server" );
                 signoff( gc );
-        }
-        else
-        {
-                md->gc = gc;
-                md->away_state = msn_away_state_list;
-                
-                msn_connections = g_slist_append( msn_connections, gc );
-        }
+                return;
+        }
+        
+        md->gc = gc;
+        md->away_state = msn_away_state_list;
+        
+        msn_connections = g_slist_append( msn_connections, gc );
 }