Changeset ae4cd12

Timestamp:

Jun 4, 2003, 2:55:59 PM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

master, barnowl_perlaim, debian, owl, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

5789230

Parents:

65ad073

Message:

convert all incoming screenname to have no space.  This is a cheap way
  to solve the space issues for now.

File:

• aim.c (modified) (8 diffs)

aim.c

@@ -422 +422 @@
   char buddies[128]; /* this is the new buddy list */
   char profile[256]; /* this is the new profile */
-  char awaymsg[] = {"blah blah blah Ole! blah blah blah"};
+  /* char awaymsg[] = {"blah blah blah Ole! blah blah blah"}; */
 
   /* Caution: Buddy1 and Buddy2 are real people! (who I don't know) */
@@ -1197 +1197 @@
 {
   struct owlfaim_priv *priv = (struct owlfaim_priv *)sess->aux_data;
-  char *tmpstr;
   int clienttype = AIM_CLIENTTYPE_UNKNOWN;
   owl_message *m;
-  char *stripmsg;
+  char *stripmsg, *nz_screenname;
   char realmsg[8192+1] = {""};
   clienttype = aim_fingerprintclient(args->features, args->featureslen);
@@ -1241 +1240 @@
     int i;
     
-    for (i = 0; i < args->msglen; i += 2) {
+    for (i=0; i<args->msglen; i+=2) {
       fu16_t uni;
 
@@ -1276 +1275 @@
   /* create a message, and put it on the message queue */
   stripmsg=owl_text_htmlstrip(realmsg);
+  nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
   m=owl_malloc(sizeof(owl_message));
-  owl_message_create_incoming_aim(m, userinfo->sn, owl_global_get_aim_screenname(&g), stripmsg);
+  owl_message_create_incoming_aim(m, nz_screenname, owl_global_get_aim_screenname(&g), stripmsg);
   owl_global_messagequeue_addmsg(&g, m);
   owl_free(stripmsg);
+  owl_free(nz_screenname);
 
   return(1);
@@ -1403 +1404 @@
 {
   aim_userinfo_t *userinfo;
+  char *nz_screenname;
 
   va_list ap;
@@ -1410 +1412 @@
 
   /* first check that we're not still ignoreing login messages */
-  if (!owl_timer_is_expired(owl_global_get_aim_login_timer(&g))) return;
-  
-  owl_buddylist_oncoming(owl_global_get_buddylist(&g), userinfo->sn);
+  if (!owl_timer_is_expired(owl_global_get_aim_login_timer(&g))) return(1);
+
+  nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
+  owl_buddylist_oncoming(owl_global_get_buddylist(&g), nz_screenname);
+  owl_free(nz_screenname);
   
   /*
@@ -1435 +1439 @@
 {
   aim_userinfo_t *userinfo;
+  char *nz_screenname;
   va_list ap;
   
@@ -1441 +1446 @@
   va_end(ap);
 
-  owl_buddylist_offgoing(owl_global_get_buddylist(&g), userinfo->sn);
+  nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
+  owl_buddylist_offgoing(owl_global_get_buddylist(&g), nz_screenname);
+  owl_free(nz_screenname);
 
   /*