Mercurial > pidgin
comparison src/status.c @ 13507:702107dd58f1
[gaim-migrate @ 15883]
I noticed that we were writing "FOO has signed off" noticed to the system log after we disconnected. With the HTML logger, this results in a new <html>...</html> block being added, with a duplicate header and everything. It seems we shouldn't be writing these messages after the system log has been closed.
"Fixing" the HTML logger might be a good idea as well.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Tue, 14 Mar 2006 06:59:14 +0000 |
parents | c358be635301 |
children | f5d4300aeed8 |
comparison
equal
deleted
inserted
replaced
13506:c358be635301 | 13507:702107dd58f1 |
---|---|
644 tmp = g_strdup_printf(_("%s went away"), buddy_alias); | 644 tmp = g_strdup_printf(_("%s went away"), buddy_alias); |
645 } | 645 } |
646 | 646 |
647 if (tmp != NULL) | 647 if (tmp != NULL) |
648 { | 648 { |
649 GaimLog *log = gaim_account_get_log(buddy->account); | 649 GaimLog *log = gaim_account_get_log(buddy->account, FALSE); |
650 | 650 |
651 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, buddy_alias, | 651 if (log != NULL) |
652 current_time, tmp); | 652 { |
653 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, buddy_alias, | |
654 current_time, tmp); | |
655 } | |
656 | |
653 g_free(tmp); | 657 g_free(tmp); |
654 } | 658 } |
655 } | 659 } |
656 | 660 |
657 if (ops != NULL && ops->update != NULL) | 661 if (ops != NULL && ops->update != NULL) |
1316 | 1320 |
1317 if (!old_idle && idle) | 1321 if (!old_idle && idle) |
1318 { | 1322 { |
1319 if (gaim_prefs_get_bool("/core/logging/log_system")) | 1323 if (gaim_prefs_get_bool("/core/logging/log_system")) |
1320 { | 1324 { |
1321 GaimLog *log = gaim_account_get_log(buddy->account); | 1325 GaimLog *log = gaim_account_get_log(buddy->account, FALSE); |
1322 char *tmp = g_strdup_printf(_("%s became idle"), | 1326 |
1323 gaim_buddy_get_alias(buddy)); | 1327 if (log != NULL) |
1324 | 1328 { |
1325 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, | 1329 char *tmp = g_strdup_printf(_("%s became idle"), |
1326 gaim_buddy_get_alias(buddy), current_time, tmp); | 1330 gaim_buddy_get_alias(buddy)); |
1327 g_free(tmp); | 1331 |
1332 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, | |
1333 gaim_buddy_get_alias(buddy), current_time, tmp); | |
1334 g_free(tmp); | |
1335 } | |
1328 } | 1336 } |
1329 } | 1337 } |
1330 else if (old_idle && !idle) | 1338 else if (old_idle && !idle) |
1331 { | 1339 { |
1332 if (gaim_prefs_get_bool("/core/logging/log_system")) | 1340 if (gaim_prefs_get_bool("/core/logging/log_system")) |
1333 { | 1341 { |
1334 GaimLog *log = gaim_account_get_log(buddy->account); | 1342 GaimLog *log = gaim_account_get_log(buddy->account, FALSE); |
1335 char *tmp = g_strdup_printf(_("%s became unidle"), | 1343 |
1336 gaim_buddy_get_alias(buddy)); | 1344 if (log != NULL) |
1337 | 1345 { |
1338 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, | 1346 char *tmp = g_strdup_printf(_("%s became unidle"), |
1339 gaim_buddy_get_alias(buddy), current_time, tmp); | 1347 gaim_buddy_get_alias(buddy)); |
1340 g_free(tmp); | 1348 |
1349 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, | |
1350 gaim_buddy_get_alias(buddy), current_time, tmp); | |
1351 g_free(tmp); | |
1352 } | |
1341 } | 1353 } |
1342 } | 1354 } |
1343 | 1355 |
1344 if (old_idle != idle) | 1356 if (old_idle != idle) |
1345 gaim_signal_emit(gaim_blist_get_handle(), "buddy-idle-changed", buddy, | 1357 gaim_signal_emit(gaim_blist_get_handle(), "buddy-idle-changed", buddy, |
1388 | 1400 |
1389 account = gaim_presence_get_account(presence); | 1401 account = gaim_presence_get_account(presence); |
1390 | 1402 |
1391 if (gaim_prefs_get_bool("/core/logging/log_system")) | 1403 if (gaim_prefs_get_bool("/core/logging/log_system")) |
1392 { | 1404 { |
1393 GaimLog *log = gaim_account_get_log(account); | 1405 GaimLog *log = gaim_account_get_log(account, FALSE); |
1394 char *msg; | 1406 |
1395 | 1407 if (log != NULL) |
1396 if (idle) | 1408 { |
1397 msg = g_strdup_printf(_("+++ %s became idle"), gaim_account_get_username(account)); | 1409 char *msg; |
1398 else | 1410 |
1399 msg = g_strdup_printf(_("+++ %s became unidle"), gaim_account_get_username(account)); | 1411 if (idle) |
1400 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, | 1412 msg = g_strdup_printf(_("+++ %s became idle"), gaim_account_get_username(account)); |
1401 gaim_account_get_username(account), | 1413 else |
1402 idle_time, msg); | 1414 msg = g_strdup_printf(_("+++ %s became unidle"), gaim_account_get_username(account)); |
1403 g_free(msg); | 1415 gaim_log_write(log, GAIM_MESSAGE_SYSTEM, |
1416 gaim_account_get_username(account), | |
1417 idle_time, msg); | |
1418 g_free(msg); | |
1419 } | |
1404 } | 1420 } |
1405 | 1421 |
1406 gc = gaim_account_get_connection(account); | 1422 gc = gaim_account_get_connection(account); |
1407 | 1423 |
1408 if (gc != NULL && gc->prpl != NULL) | 1424 if (gc != NULL && gc->prpl != NULL) |