comparison pidgin/gtkmain.c @ 19661:aa3920f45ff3

merge of '906281124efc7c5fcab1d5a7b8066c6a99d7927d' and '9d3e08ca8d3c17d78b9671fdffc4a0769a0a1495'
author Kevin Stange <kevin@simguy.net>
date Thu, 06 Sep 2007 06:59:23 +0000
parents b99a158ea85e fe51c6de1a7f
children 44b4e8bd759b
comparison
equal deleted inserted replaced
19590:2f7b3564bb7e 19661:aa3920f45ff3
772 purple_plugins_load_saved(PIDGIN_PREFS_ROOT "/plugins/loaded"); 772 purple_plugins_load_saved(PIDGIN_PREFS_ROOT "/plugins/loaded");
773 773
774 /* TODO: Move pounces loading into purple_pounces_init() */ 774 /* TODO: Move pounces loading into purple_pounces_init() */
775 purple_pounces_load(); 775 purple_pounces_load();
776 776
777 /* HACK BY SEANEGAN:
778 * We've renamed prpl-oscar to prpl-aim and prpl-icq, accordingly.
779 * Let's do that change right here... after everything's loaded, but
780 * before anything has happened
781 */
782 for (accounts = purple_accounts_get_all(); accounts != NULL; accounts = accounts->next) {
783 PurpleAccount *account = accounts->data;
784 if (!strcmp(purple_account_get_protocol_id(account), "prpl-oscar")) {
785 if (isdigit(*purple_account_get_username(account)))
786 purple_account_set_protocol_id(account, "prpl-icq");
787 else
788 purple_account_set_protocol_id(account, "prpl-aim");
789 }
790 }
791
792 ui_main(); 777 ui_main();
793 778
794 #ifdef USE_SM 779 #ifdef USE_SM
795 pidgin_session_init(argv[0], opt_session_arg, opt_config_dir_arg); 780 pidgin_session_init(argv[0], opt_session_arg, opt_config_dir_arg);
796 #endif 781 #endif