Index: BuddyItem.h
===================================================================
RCS file: /cvsroot/fire/fire/BuddyItem.h,v
retrieving revision 1.12
diff -r1.12 BuddyItem.h
68a69,70
> - (NSString *)shortNameString;

> 

Index: BuddyItem.m
===================================================================
RCS file: /cvsroot/fire/fire/BuddyItem.m,v
retrieving revision 1.34
diff -r1.34 BuddyItem.m
204a205,217
> - (NSString *)shortNameString
> {
>     NSString* bName = [self buddyName] ;
>     NSString* dName = [self displayName] ;
>     
>     if (!dName || [dName length] == 0) {
>         dName = bName ;
>     }
> 
>     return dName;
> 
> }
> 
Index: MainController.m
===================================================================
RCS file: /cvsroot/fire/fire/MainController.m,v
retrieving revision 1.99
diff -r1.99 MainController.m
1354a1355
>     NSString *notifySpeechString = nil;
1388a1390
>             notifySpeechString = [NSString stringWithFormat:BUDDY_SENT_YOU_MSG, [buddyItem shortNameString]];
1401a1404
>             notifySpeechString = [NSString stringWithFormat:YOU_SENT_MSG_TO, [buddyItem shortNameString]];
1414a1418
>             notifySpeechString = [NSString stringWithFormat:BUDDY_SENT_YOU_MSG, [buddyItem shortNameString]];
1428a1433
>             notifySpeechString = [NSString stringWithFormat:BUDDY_LOGGED_ON_MSG, [buddyItem shortNameString]];
1442a1448
>             notifySpeechString = [NSString stringWithFormat:BUDDY_LOGGED_OFF_MSG, [buddyItem shortNameString]];
1456a1463
>             notifySpeechString = [NSString stringWithFormat:BUDDY_SENT_YOU_KNOCK_KNOCK, [buddyItem shortNameString]];
1488c1495
<             [[self speaker] speakText:notifyDialogString];
---
>             [[self speaker] speakText:notifySpeechString];