Mercurial > pidgin.yaz
comparison pidgin/gtkmain.c @ 16062:07554cc5d090
Rename /purple/gtk preferences back to /gaim/gtk to allow for smooth upgrades
until someone comes up with something cleverererer
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Wed, 11 Apr 2007 13:38:05 +0000 |
parents | eae8e127e4fb |
children | 634b96915d2e |
comparison
equal
deleted
inserted
replaced
16061:3b86ad370861 | 16062:07554cc5d090 |
---|---|
740 purple_prefs_load(); | 740 purple_prefs_load(); |
741 purple_prefs_update_old(); | 741 purple_prefs_update_old(); |
742 pidgin_prefs_update_old(); | 742 pidgin_prefs_update_old(); |
743 | 743 |
744 /* load plugins we had when we quit */ | 744 /* load plugins we had when we quit */ |
745 purple_plugins_load_saved("/purple/gtk/plugins/loaded"); | 745 purple_plugins_load_saved(PIDGIN_PREFS_ROOT "/plugins/loaded"); |
746 pidgin_docklet_init(); | 746 pidgin_docklet_init(); |
747 | 747 |
748 /* TODO: Move pounces loading into purple_pounces_init() */ | 748 /* TODO: Move pounces loading into purple_pounces_init() */ |
749 purple_pounces_load(); | 749 purple_pounces_load(); |
750 | 750 |
782 * We want to show the blist early in the init process so the | 782 * We want to show the blist early in the init process so the |
783 * user feels warm and fuzzy (not cold and prickley). | 783 * user feels warm and fuzzy (not cold and prickley). |
784 */ | 784 */ |
785 purple_blist_show(); | 785 purple_blist_show(); |
786 | 786 |
787 if (purple_prefs_get_bool("/purple/gtk/debug/enabled")) | 787 if (purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/debug/enabled")) |
788 pidgin_debug_window_show(); | 788 pidgin_debug_window_show(); |
789 | 789 |
790 if (opt_login) { | 790 if (opt_login) { |
791 dologin_ret = dologin_named(opt_login_arg); | 791 dologin_ret = dologin_named(opt_login_arg); |
792 if (opt_login_arg != NULL) { | 792 if (opt_login_arg != NULL) { |