[Ayttm-commits] CVS: ayttm/modules/yahoo2 yahoo.c,1.34,1.35

[Philip S Tellis <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/yahoo2
In directory subversions:/tmp/cvs-serv7550/modules/yahoo2

Modified Files:
        yahoo.c 
Log Message:
fix bug in yab if only fname set


Index: yahoo.c
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/yahoo2/yahoo.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- yahoo.c     29 Jan 2003 20:06:15 -0000      1.34
+++ yahoo.c     30 Jan 2003 07:27:57 -0000      1.35
@@ -1879,13 +1879,14 @@
                yab->fname[i]='\0';
 
        tmp = strchr(yab->fname, ' ');
-       if(tmp)
+       if(tmp) {
                *tmp++='\0';
 
-       yab->lname = tmp;
-       tmp = strchr(yab->lname, ' ');
-       if(tmp)
-               yab->lname=tmp;
+               yab->lname = tmp;
+               tmp = strchr(yab->lname, ' ');
+               if(tmp)
+                       yab->lname=tmp;
+       }
 
        yahoo_add_yab(ylad->id, yab);
 
@@ -1945,7 +1946,7 @@
 
                        if (!strcmp(bud->id, ea->handle)) {
                                LOG(("buddy %s exists, not adding", 
ea->handle));
-                               if(!bud->real_name && ea->account_contact && 
ea->account_contact->nick) {
+                               if(!i && !bud->real_name && ea->account_contact 
&& ea->account_contact->nick) {
                                        eb_yahoo_set_buddy_nick(ylad, bud, 
ea->account_contact->nick);
                                }
                                return;
@@ -1957,8 +1958,11 @@
 
        if(!strcmp(ea->account_contact->group->name, _("Ignore")))
                yahoo_ignore_buddy(ylad->id, ea->handle, FALSE);
-       else
+       else {
+               struct yahoo_buddy b = {NULL, ea->handle, NULL, NULL };
                yahoo_add_buddy(ylad->id, ea->handle, 
ea->account_contact->group->name);
+               eb_yahoo_set_buddy_nick(ylad, &b, ea->account_contact->nick);
+       }
        yahoo_refresh(ylad->id);
 }
 
@@ -2358,7 +2362,7 @@
        int tag;
 } eb_yahoo_callback_data;
 
-static void eb_yahoo_callback(gpointer data, int source, eb_input_condition 
condition)
+static void eb_yahoo_callback(void * data, int source, eb_input_condition 
condition)
 {
        eb_yahoo_callback_data *d = data;
        int ret=1;