diff src/blist.h @ 10349:655c48791b3c

[gaim-migrate @ 11563] Removed "Use remote alias when no alias is set" Defaulted to: Conversation titles: No Conversation messages: Yes Buddy list: Yes I barely use MSN, and I use ICQ even less, so if someone thinks of better defaults let me know. These seem to be the best for me. The trick is that on MSN, the server alias usually is less helpful than the screenname and on ICQ, it's more helpful. An alternative is to have the prpl specify which to use, but that's dumb. committer: Tailor Script <[e-mail]>

--- a/src/blist.h	Sun Dec 12 23:57:52 2004 +0000
+++ b/src/blist.h	Mon Dec 13 00:52:07 2004 +0000
@@ -553,8 +553,8 @@
  * Returns the alias of a buddy.
  *
  * @param buddy   The buddy whose name will be returned.
- * @return        The alias (if set), server alias (if set and preference
- *                is to display server aliases), or NULL.
+ * @return        The alias (if set), server alias (if set),
+ *                or NULL.
  */
 const char *gaim_buddy_get_alias_only(GaimBuddy *buddy);
 
@@ -570,6 +570,15 @@
  */
 const char *gaim_buddy_get_contact_alias(GaimBuddy *buddy);
 
+/**
+ * Returns the correct alias for this user, ignoring server aliases.  Used
+ * when a user-recognizable name is required.  In order: buddy's alias; buddy's
+ * contact alias; buddy's user name.
+ * 
+ * @param buddy  The buddy whose alias will be returned.
+ * @return       The appropriate name or alias.
+ */
+const char *gaim_buddy_get_local_alias(GaimBuddy *buddy);
 
 /**
  * Returns the correct name to display for a buddy. In order of precedence:
@@ -716,7 +725,6 @@
 /** @name Buddy list file management API                                                */
 /****************************************************************************************/
 
-/*@{*/
 /**
  * Parses the toc-style buddy list used in older versions of Gaim and for SSI in toc.c
  *
@@ -732,12 +740,6 @@
 void gaim_blist_load();
 
 /**
- * Force an immediate write of the buddy list.  Normally the buddy list is
- * saved automatically a few seconds after a change is made.
- */
-void gaim_blist_sync();
-
-/**
  * Requests from the user information needed to add a buddy to the
  * buddy list.
  *