# HG changeset patch
# User Casey Harkins <charkins@pidgin.im>
# Date 1177995715 0
# Node ID ccce74d54eddfa7d9d769b8cc1cafa29b6185c41
# Parent  964078401036e64cb10354865c921c2d00f252e4# Parent  130d72ab7e2507ecfd25648ec01d2903a70eccd4
merge of '89aee9cfd6a64bcb3656a2ba271a600f3558f891'
     and '9d1676f151b2336350170d45eacbd5b83958fe2c'

diff -r 964078401036 -r ccce74d54edd pidgin/gtkmain.c
--- 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();