Changeset c2fb3809 for protocols/yahoo

Timestamp:

2007-04-15T22:39:35Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

84b045d

Parents:

cd4723c

Message:

Cleaned up struct im_connection. No more username/password stuff since
it's in acc too. wants_to_die is now an argument to imc_logout().

File:

• protocols/yahoo/yahoo.c (modified) (7 diffs)

protocols/yahoo/yahoo.c

@@ -361 +361 @@
         YList *members;
         
-        roomname = g_new0( char, strlen( ic->username ) + 16 );
-        g_snprintf( roomname, strlen( ic->username ) + 16, "%s-Bee-%d", ic->username, byahoo_chat_id );
+        roomname = g_strdup_printf( "%s-Bee-%d", ic->acc->user, byahoo_chat_id );
         
         c = serv_got_joined_chat( ic, roomname );
-        add_chat_buddy( c, ic->username );
+        add_chat_buddy( c, ic->acc->user );
         
         /* FIXME: Free this thing when the chat's destroyed. We can't *always*
@@ -518 +517 @@
         {
                 char *errstr;
+                int allow_reconnect = TRUE;
                 
                 yd->logged_in = FALSE;
@@ -530 +530 @@
                 {
                         errstr = "Logged in on a different machine or device";
-                        ic->wants_to_die = TRUE;
+                        allow_reconnect = FALSE;
                 }
                 else if( succ == YAHOO_LOGIN_SOCK )
@@ -542 +542 @@
                         imc_error( ic, "Error %d (%s)", succ, errstr );
                 
-                imc_logout( ic );
+                imc_logout( ic, allow_reconnect );
         }
 }
@@ -642 +642 @@
         
         if( fatal )
-                imc_logout( ic );
+                imc_logout( ic, TRUE );
 }
 
@@ -768 +768 @@
 {
         yahoo_conference_logon( inv->yid, NULL, inv->members, inv->name );
-        add_chat_buddy( inv->c, inv->ic->username );
+        add_chat_buddy( inv->c, inv->ic->acc->user );
         g_free( inv->name );
         g_free( inv );
@@ -798 +798 @@
         
         for( m = members; m; m = m->next )
-                if( g_strcasecmp( m->data, ic->username ) != 0 )
+                if( g_strcasecmp( m->data, ic->acc->user ) != 0 )
                         add_chat_buddy( inv->c, m->data );