comparison: libpurple/protocols/zephyr/zephyr.c
libpurple/protocols/zephyr/zephyr.c
- branch
- next.minor
- changeset 24950
- 143f594f0cd0
- parent 24945
- 6678a8c83797
- child 24990
- e2fdc2cd23a4
equal
deleted
inserted
replaced
| 24949:8557854c3622 | 24950:143f594f0cd0 |
|---|---|
| 787 if ((b && pending_zloc(zephyr,bname)) || pending_zloc(zephyr,user)) { | 787 if ((b && pending_zloc(zephyr,bname)) || pending_zloc(zephyr,user)) { |
| 788 ZLocations_t locs; | 788 ZLocations_t locs; |
| 789 int one = 1; | 789 int one = 1; |
| 790 PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); | 790 PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); |
| 791 char *tmp; | 791 char *tmp; |
| 792 const char *balias; | |
| 792 | 793 |
| 793 purple_notify_user_info_add_pair(user_info, _("User"), (b ? bname : user)); | 794 purple_notify_user_info_add_pair(user_info, _("User"), (b ? bname : user)); |
| 794 if (b && b->alias) | 795 balias = purple_buddy_get_local_buddy_alias(b); |
| 795 purple_notify_user_info_add_pair(user_info, _("Alias"), b->alias); | 796 if (b && balias) |
| 797 purple_notify_user_info_add_pair(user_info, _("Alias"), balias); | |
| 796 | 798 |
| 797 if (!nlocs) { | 799 if (!nlocs) { |
| 798 purple_notify_user_info_add_pair(user_info, NULL, _("Hidden or not logged-in")); | 800 purple_notify_user_info_add_pair(user_info, NULL, _("Hidden or not logged-in")); |
| 799 } | 801 } |
| 800 for (; nlocs > 0; nlocs--) { | 802 for (; nlocs > 0; nlocs--) { |
| 1168 | 1170 |
| 1169 bname = b ? purple_buddy_get_name(b) : NULL; | 1171 bname = b ? purple_buddy_get_name(b) : NULL; |
| 1170 if ((b && pending_zloc(zephyr,bname)) || pending_zloc(zephyr,user) || pending_zloc(zephyr,local_zephyr_normalize(zephyr,user))){ | 1172 if ((b && pending_zloc(zephyr,bname)) || pending_zloc(zephyr,user) || pending_zloc(zephyr,local_zephyr_normalize(zephyr,user))){ |
| 1171 PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); | 1173 PurpleNotifyUserInfo *user_info = purple_notify_user_info_new(); |
| 1172 char *tmp; | 1174 char *tmp; |
| 1175 const char *balias; | |
| 1173 | 1176 |
| 1174 purple_notify_user_info_add_pair(user_info, _("User"), (b ? bname : user)); | 1177 purple_notify_user_info_add_pair(user_info, _("User"), (b ? bname : user)); |
| 1175 | 1178 |
| 1176 if (b && b->alias) | 1179 balias = b ? purple_buddy_get_local_buddy_alias(b) : NULL; |
| 1177 purple_notify_user_info_add_pair(user_info, _("Alias"), b->alias); | 1180 if (balias) |
| 1178 | 1181 purple_notify_user_info_add_pair(user_info, _("Alias"), balias); |
| 1182 | |
| 1179 if (!nlocs) { | 1183 if (!nlocs) { |
| 1180 purple_notify_user_info_add_pair(user_info, NULL, _("Hidden or not logged-in")); | 1184 purple_notify_user_info_add_pair(user_info, NULL, _("Hidden or not logged-in")); |
| 1181 } else { | 1185 } else { |
| 1182 tmp = g_strdup_printf(_("<br>At %s since %s"), | 1186 tmp = g_strdup_printf(_("<br>At %s since %s"), |
| 1183 tree_child(tree_child(tree_child(tree_child(locations,2),0),0),2)->contents, | 1187 tree_child(tree_child(tree_child(tree_child(locations,2),0),0),2)->contents, |
