adium 3326:8dbd9797f02b: Oops. Need to wait to init AMPurpleJabb...

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


details:	http://hg.adium.im/adium/rev/8dbd9797f02b
revision:	3326:8dbd9797f02b
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.
(transplanted from 7ce5827e11e10e14f4f97e3157a9a67e94e1d82b)

diffs (22 lines):

diff -r 1760d3bfac88 -r 8dbd9797f02b 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
@@ -52,8 +52,6 @@
 - (void)initAccount
 {
 	[super initAccount];
-
-	adhocServer = [[AMPurpleJabberAdHocServer alloc] initWithAccount:self];
 }
 
 /*!
@@ -182,6 +180,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