Mercurial > pidgin
comparison finch/finch.c @ 16566:45773df910e0
merge of 'a8caeb1c79d1daf68ca89b1cc36cef4578306ea1'
and 'e33fd060bfb78ebc76bd2ce4b79eeb82dc3ad48f'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 28 Apr 2007 04:10:18 +0000 |
| parents | ac0d07c7fd90 |
| children | 30829e806dae |
comparison
equal
deleted
inserted
replaced
| 16564:40b90b191ff3 | 16566:45773df910e0 |
|---|---|
| 326 purple_blist_load(); | 326 purple_blist_load(); |
| 327 | 327 |
| 328 /* TODO: Move prefs loading into purple_prefs_init() */ | 328 /* TODO: Move prefs loading into purple_prefs_init() */ |
| 329 purple_prefs_load(); | 329 purple_prefs_load(); |
| 330 purple_prefs_update_old(); | 330 purple_prefs_update_old(); |
| 331 purple_prefs_rename("/gaim/gnt", "/finch"); | 331 finch_prefs_update_old(); |
| 332 purple_prefs_rename("/purple/gnt", "/finch"); | |
| 333 | 332 |
| 334 /* load plugins we had when we quit */ | 333 /* load plugins we had when we quit */ |
| 335 purple_plugins_load_saved("/finch/plugins/loaded"); | 334 purple_plugins_load_saved("/finch/plugins/loaded"); |
| 336 | 335 |
| 337 /* TODO: Move pounces loading into purple_pounces_init() */ | 336 /* TODO: Move pounces loading into purple_pounces_init() */ |