# HG changeset patch # User Richard Laager # Date 1135817051 0 # Node ID 57462d6542ea2ce3ca8744a042fbbaa2974745c8 # Parent a99a0cc677138d66888d722b0c964066ae1f9697 [gaim-migrate @ 15011] Fix SF Bug #1391106 When logging to the system log, we made no distinction between signing off/on and going away / coming back. committer: Tailor Script diff -r a99a0cc67713 -r 57462d6542ea src/status.c --- a/src/status.c Thu Dec 29 00:21:53 2005 +0000 +++ b/src/status.c Thu Dec 29 00:44:11 2005 +0000 @@ -616,15 +616,27 @@ const char *buddy_alias = gaim_buddy_get_alias(buddy); char *tmp = NULL; - if (((old_status == NULL) || !gaim_status_is_available(old_status)) && - gaim_status_is_available(new_status)) + if (gaim_status_is_available(new_status)) { - tmp = g_strdup_printf(_("%s came back"), buddy_alias); + if (((old_status == NULL) || !gaim_status_is_online(old_status))) + { + tmp = g_strdup_printf(_("%s signed on"), buddy_alias); + } + else if (!gaim_status_is_available(old_status)) + { + tmp = g_strdup_printf(_("%s came back"), buddy_alias); + } } - else if ((old_status != NULL) && gaim_status_is_available(old_status) && - !gaim_status_is_available(new_status)) + else if ((old_status != NULL) && gaim_status_is_available(old_status)) { - tmp = g_strdup_printf(_("%s went away"), buddy_alias); + if (!gaim_status_is_online(new_status)) + { + tmp = g_strdup_printf(_("%s signed off"), buddy_alias); + } + else if (!gaim_status_is_available(new_status)) + { + tmp = g_strdup_printf(_("%s went away"), buddy_alias); + } } if (tmp != NULL)