Mercurial > pidgin.yaz
comparison src/protocols/msn/switchboard.c @ 10487:659edfcac14e
[gaim-migrate @ 11777]
Removed protocol preferences.
MSN will display closed conversation messages but not timeouts.
Jabber will not display your OS.
I left the preferences for OSCAR, but removed them from the UI. OSCAR is
complicated because it stores prefs on the server. I'll let Mark figure
out a smarter way to handle that.
As with all slashed prefs, feel free to voice objections.
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Sat, 08 Jan 2005 20:30:41 +0000 |
parents | bcfea6c3d5c9 |
children | 1a97d5e88d12 |
comparison
equal
deleted
inserted
replaced
10486:84bc372a621e | 10487:659edfcac14e |
---|---|
624 | 624 |
625 char *str = NULL; | 625 char *str = NULL; |
626 | 626 |
627 if (cmd->param_count == 2 && atoi(cmd->params[1]) == 1) | 627 if (cmd->param_count == 2 && atoi(cmd->params[1]) == 1) |
628 { | 628 { |
629 #if 0 | |
629 if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_timeout_notice")) | 630 if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_timeout_notice")) |
630 { | 631 { |
631 str = g_strdup_printf(_("The conversation has become " | 632 str = g_strdup_printf(_("The conversation has become " |
632 "inactive and timed out.")); | 633 "inactive and timed out.")); |
633 } | 634 } |
635 #endif | |
634 } | 636 } |
635 else | 637 else |
636 { | 638 { |
637 if (gaim_prefs_get_bool("/plugins/prpl/msn/conv_close_notice")) | 639 char *username; |
638 { | 640 GaimAccount *account; |
639 char *username; | 641 GaimBuddy *b; |
640 GaimAccount *account; | 642 |
641 GaimBuddy *b; | 643 account = cmdproc->session->account; |
642 | 644 |
643 account = cmdproc->session->account; | 645 if ((b = gaim_find_buddy(account, user)) != NULL) |
644 | 646 username = gaim_escape_html(gaim_buddy_get_alias(b)); |
645 if ((b = gaim_find_buddy(account, user)) != NULL) | 647 else |
646 username = gaim_escape_html(gaim_buddy_get_alias(b)); | 648 username = gaim_escape_html(user); |
647 else | 649 |
648 username = gaim_escape_html(user); | 650 str = g_strdup_printf(_("%s has closed the conversation " |
649 | 651 "window."), username); |
650 str = g_strdup_printf(_("%s has closed the conversation " | 652 |
651 "window."), username); | 653 g_free(username); |
652 | 654 |
653 g_free(username); | |
654 } | |
655 } | 655 } |
656 | 656 |
657 if (str != NULL) | 657 if (str != NULL) |
658 msn_switchboard_report_user(swboard, GAIM_MESSAGE_SYSTEM, str); | 658 msn_switchboard_report_user(swboard, GAIM_MESSAGE_SYSTEM, str); |
659 | 659 |