Mercurial > pidgin
comparison src/blist.c @ 6036:547ba881bc7e
[gaim-migrate @ 6486]
Fix the --login=[NAME] command line argument.
Fix the password prompt when signing on an account with no password set. I
made some similar changes that probably fix problems with the filectl plugin,
using gaim-remote to sign on an account, and signing on an account via perl
script. (The change is calling gaim_account_connect() instead of
serv_login().)
Fix a silly compiler warning.
committer: Tailor Script <tailor@pidgin.im>
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Sat, 05 Jul 2003 22:24:57 +0000 |
parents | 5a0060191a77 |
children | d5f4ae4f9a02 |
comparison
equal
deleted
inserted
replaced
6035:8c44020a958e | 6036:547ba881bc7e |
---|---|
346 ops->new_node((GaimBlistNode *)chat); | 346 ops->new_node((GaimBlistNode *)chat); |
347 | 347 |
348 return chat; | 348 return chat; |
349 } | 349 } |
350 | 350 |
351 const char *gaim_chat_get_display_name(struct chat *chat) | 351 char *gaim_chat_get_display_name(struct chat *chat) |
352 { | 352 { |
353 char *name; | 353 char *name; |
354 | 354 |
355 if(chat->alias){ | 355 if(chat->alias){ |
356 name = g_strdup(chat->alias); | 356 name = g_strdup(chat->alias); |
767 } | 767 } |
768 | 768 |
769 char * gaim_get_buddy_alias (struct buddy *buddy) | 769 char * gaim_get_buddy_alias (struct buddy *buddy) |
770 { | 770 { |
771 char *ret = gaim_get_buddy_alias_only(buddy); | 771 char *ret = gaim_get_buddy_alias_only(buddy); |
772 if(!ret) | 772 |
773 return buddy ? buddy->name : _("Unknown"); | 773 if(!ret) |
774 return ret; | 774 return buddy ? buddy->name : _("Unknown"); |
775 | 775 |
776 return ret; | |
776 } | 777 } |
777 | 778 |
778 struct buddy *gaim_find_buddy(GaimAccount *account, const char *name) | 779 struct buddy *gaim_find_buddy(GaimAccount *account, const char *name) |
779 { | 780 { |
780 static struct buddy *buddy = NULL; | 781 static struct buddy *buddy = NULL; |