soc.2009.transport: a93cd788: Last HIICQ strings renamed to spectrum

[hanzz at soc.pidgin.im]

-----------------------------------------------------------------
Revision: a93cd788e8444de0ef3b9656ff9ae3727fd61a66
Ancestor: 582b197f4de7264036f24907746b48d21f0b2ff2
Author: hanzz at soc.pidgin.im
Date: 2009-08-05T07:50:15
Branch: im.pidgin.soc.2009.transport
URL: http://d.pidgin.im/viewmtn/revision/info/a93cd788e8444de0ef3b9656ff9ae3727fd61a66

Modified files:
        main.cpp main.h spectrum.cfg user.cpp

ChangeLog: 

Last HIICQ strings renamed to spectrum

-------------- next part --------------
============================================================
--- main.cpp	983acba02d1fc482ad595e62b1a4eaf2ab240659
+++ main.cpp	806f5410044f9c7a3c9eb6cbf530ebfc21d5d03b
@@ -1500,7 +1500,7 @@ bool GlooxMessageHandler::initPurple(){
 	purple_core_set_ui_ops(&coreUiOps);
 	purple_eventloop_set_ui_ops(getEventLoopUiOps());
 
-	ret = purple_core_init(HIICQ_UI);
+	ret = purple_core_init(PURPLE_UI);
 	if (ret) {
 		static int conversation_handle;
 		static int conn_handle;
============================================================
--- main.h	c97f96e6e96086ae6d951caeaa369997782b746e
+++ main.h	29b16ab6ffb8faccf29b98a53300df46355bf69d
@@ -60,7 +60,7 @@
 #include <libintl.h>
 #include <locale.h>
 
-#define HIICQ_UI "hiicq"
+#define PURPLE_UI "spectrum"
 #define tr(lang,STRING)    localization.translate(lang,STRING)
 #define _(STRING)    STRING
 
============================================================
--- spectrum.cfg	cad7044aae89ec56fa6ef4b17fb1284107a59aed
+++ spectrum.cfg	4079c237ec18b08217e13db31557133f2655a007
@@ -16,7 +16,7 @@ port=5347
 port=5347
 
 # directory where downloaded files will be saved
-filetransfer_cache=/usr/local/var/lib/hiicq
+filetransfer_cache=/var/lib/spectrum
 
 # one of: aim, facebook, gg, icq, irc, msn, myspace, qq, simple, xmpp 
 protocol=icq
@@ -64,4 +64,5 @@ prefix=icq_localhost_
 #bind=0.0.0.0
 
 # avatar, vcard, roster storage
-userdir=/usr/local/var/lib/hiicq
\ No newline at end of file
+# needs to be unique for each spectrum instance
+userdir=/var/lib/spectrum/icq
============================================================
--- user.cpp	471d2fc3f396b71f1c6a59c1f7d4886901cad295
+++ user.cpp	830bc1f68fd8465259bcff1c65db69974c20bc4d
@@ -910,7 +910,7 @@ void User::connect(){
 		valid = p->protocol()->isValidUsername(m_username);
 	}
 	if (valid && purple_value_get_boolean(getSetting("enable_transport"))){
-		purple_account_set_enabled(m_account, HIICQ_UI, TRUE);
+		purple_account_set_enabled(m_account, PURPLE_UI, TRUE);
 		purple_account_connect(m_account);
 	}
 }
@@ -1261,7 +1261,7 @@ User::~User(){
 
 User::~User(){
 
-	purple_account_set_enabled(m_account, HIICQ_UI, TRUE);
+	purple_account_set_enabled(m_account, PURPLE_UI, TRUE);
 
 	// send unavailable to online users
 	Tag *tag;