Mercurial > pidgin.yaz

diff libpurple/protocols/zephyr/zephyr.c @ 25294:8aa7d8bcbc7d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Alias foo. I think blist.h structs are now completely hidden.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Fri, 31 Oct 2008 21:06:26 +0000
parents aa876d48b5b2
children 9bdd3ab8087f
line wrap: on
line diff
--- a/libpurple/protocols/zephyr/zephyr.c	Fri Oct 31 20:04:35 2008 +0000
+++ b/libpurple/protocols/zephyr/zephyr.c	Fri Oct 31 21:06:26 2008 +0000
@@ -789,10 +789,12 @@
 				int one = 1;
 				PurpleNotifyUserInfo *user_info = purple_notify_user_info_new();
 				char *tmp;
+				const char *balias;
 
 				purple_notify_user_info_add_pair(user_info, _("User"), (b ? bname : user));
-				if (b && b->alias)
-					purple_notify_user_info_add_pair(user_info, _("Alias"), b->alias);
+				balias = purple_buddy_get_local_buddy_alias(b);
+				if (b && balias)
+					purple_notify_user_info_add_pair(user_info, _("Alias"), balias);
 
 				if (!nlocs) {
 					purple_notify_user_info_add_pair(user_info, NULL, _("Hidden or not logged-in"));
@@ -1170,12 +1172,14 @@
 				if ((b && pending_zloc(zephyr,bname)) || pending_zloc(zephyr,user) || pending_zloc(zephyr,local_zephyr_normalize(zephyr,user))){
 					PurpleNotifyUserInfo *user_info = purple_notify_user_info_new();
 					char *tmp;
+					const char *balias;
 
 					purple_notify_user_info_add_pair(user_info, _("User"), (b ? bname : user));
 
-					if (b && b->alias)
-						purple_notify_user_info_add_pair(user_info, _("Alias"), b->alias);
-											
+					balias = b ? purple_buddy_get_local_buddy_alias(b) : NULL;
+					if (balias)
+						purple_notify_user_info_add_pair(user_info, _("Alias"), balias);
+
 					if (!nlocs) {
 						purple_notify_user_info_add_pair(user_info, NULL, _("Hidden or not logged-in"));
 					} else {