pass to gtkgui changed

common/thread.py

@@ -25,8 +25,6 @@ import time
 
 sys.path.append("..")
 
-import plugins.sock
-
 class GajimThread(threading.Thread): 
 	def __init__(self, name = None, queueIn = None, queueOut = None): 
 		self.queueIn = queueIn
@@ -37,8 +35,12 @@ class GajimThread(threading.Thread):
 	# END __init__
  
 	def run(self):
+		print "import plugins.%s" % self.getName()
 		mod = compile("import plugins.%s" % self.getName(), \
 			self.getName(), "exec")
 		res = eval(mod)
+		print "plugins.%s.plugin(self.queueIn, self.queueOut)" % self.getName()
+		mod = compile("plugins.%s.%s.plugin(self.queueIn, self.queueOut)" % (self.getName(),self.getName()), self.getName(), "exec")
+		res = eval(mod)
 	# END run
 # END GajimThread

core/core.py

@@ -85,10 +85,13 @@ class GajimCore:
 		log.debug("disconnectedCB")
 	# END disconenctedCB
 
-	def connect(self):
+	def connect(self, account):
+		hostname = self.cfgParser.__getattr__("%s" % account+"_hostname")
+		name = self.cfgParser.__getattr__("%s" % account+"_name")
+		password = self.cfgParser.__getattr__("%s" % account+"_password")
+		ressource = self.cfgParser.__getattr__("%s" % account+"_ressource")
 		self.con = common.jabber.Client(host = \
-			self.cfgParser.Server_hostname, \
-			debug = False, log = sys.stderr)
+			hostname, debug = False, log = sys.stderr)
 		try:
 			self.con.connect()
 		except IOError, e:
@@ -100,10 +103,7 @@ class GajimCore:
 			self.con.setMessageHandler(self.messageCB)
 			self.con.setPresenceHandler(self.presenceCB)
 			self.con.setDisconnectHandler(self.disconnectedCB)
-			if self.con.auth(self.cfgParser.Profile_name,
-					self.cfgParser.Profile_password, 
-					self.cfgParser.Profile_ressource):
-
+			if self.con.auth(name, password, ressource):
 				self.con.requestRoster()
 				roster = self.con.getRoster().getRaw()
 				if not roster :
@@ -124,14 +124,14 @@ class GajimCore:
 						self.con.disconnect()
 					self.hub.sendPlugin('QUIT', ())
 					return
-				#('STATUS', status)
+				#('STATUS', (status, account))
 				elif ev[0] == 'STATUS':
-					if (ev[1] != 'offline') and (self.connected == 0):
-						self.connect()
-					elif (ev[1] == 'offline') and (self.connected == 1):
+					if (ev[1][0] != 'offline') and (self.connected == 0):
+						self.connect(ev[1][1])
+					elif (ev[1][0] == 'offline') and (self.connected == 1):
 						self.con.disconnect()
 						self.connected = 0
-					if ev[1] != 'offline':
+					if ev[1][0] != 'offline':
 						p = common.jabber.Presence()
 						p.setShow(ev[1])
 						self.con.send(p)

doc/gajimrc

@@ -13,6 +13,7 @@ ressource = gajim
 delauth = 1
 delroster = 1
 alwaysauth = 0
+modules = sock
 
 [GtkGui]