Mercurial > pidgin.yaz
changeset 16754:ccce74d54edd
merge of '89aee9cfd6a64bcb3656a2ba271a600f3558f891'
and '9d1676f151b2336350170d45eacbd5b83958fe2c'
| author | Casey Harkins <charkins@pidgin.im> |
|---|---|
| date | Tue, 01 May 2007 05:01:55 +0000 |
| parents | 964078401036 (current diff) 130d72ab7e25 (diff) |
| children | 4cb9f5cc07ba |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/pidgin/gtkmain.c Tue May 01 04:38:24 2007 +0000 +++ b/pidgin/gtkmain.c Tue May 01 05:01:55 2007 +0000 @@ -318,6 +318,7 @@ pidgin_xfers_init(); pidgin_roomlist_init(); pidgin_log_init(); + pidgin_docklet_init(); } static void @@ -745,7 +746,6 @@ /* load plugins we had when we quit */ purple_plugins_load_saved(PIDGIN_PREFS_ROOT "/plugins/loaded"); - pidgin_docklet_init(); /* TODO: Move pounces loading into purple_pounces_init() */ purple_pounces_load();