adium-1.4 3043:7ce5827e11e1: Oops. Need to wait to init AMPurple...

commits at adium.im commits at adium.im
Mon Sep 20 03:25:13 UTC 2010


details:	http://hg.adium.im/adium-1.4/rev/7ce5827e11e1
revision:	3043:7ce5827e11e1
author:		Evan Schoenberg
date:		Sun Sep 19 22:25:08 2010 -0500

Oops. Need to wait to init AMPurpleJabberAdHocServer until after libpurple has been initialized.

diffs (22 lines):

diff -r c6ef8efaf14f -r 7ce5827e11e1 Plugins/Purple Service/ESPurpleJabberAccount.m
--- a/Plugins/Purple Service/ESPurpleJabberAccount.m	Sun Sep 19 22:06:04 2010 -0500
+++ b/Plugins/Purple Service/ESPurpleJabberAccount.m	Sun Sep 19 22:25:08 2010 -0500
@@ -51,8 +51,6 @@
 - (void)initAccount
 {
 	[super initAccount];
-
-	adhocServer = [[AMPurpleJabberAdHocServer alloc] initWithAccount:self];
 }
 
 /*!
@@ -181,6 +179,9 @@
 	 * This preference and the changes for it are added via the "libpurple_jabber_avoid_sasl_option_hack.diff" patch we apply during the build process.
 	 */
 	purple_prefs_set_bool("/plugins/prpl/jabber/avoid_sasl_for_plain_auth", YES);
+	
+	if (!adhocServer)
+		adhocServer = [[AMPurpleJabberAdHocServer alloc] initWithAccount:self];
 }
 
 - (NSString *)serverSuffix




More information about the commits mailing list