From 77cd5796af3e4b24a448b77ecc4f053e6b303e10 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Wed, 22 Aug 2007 18:56:29 +0000
Subject: Revert "DevConsole/Purk: Support for auto-join channels on connect, new button to connect to #olpc-help"

This reverts commit 104b158a8003b0967ed1dea19ed5652e4fba8d8c.
---
(limited to 'services/console/lib/purk/irc.py')

diff --git a/services/console/lib/purk/irc.py b/services/console/lib/purk/irc.py
index 48d1fb8..d5a01aa 100644
--- a/services/console/lib/purk/irc.py
+++ b/services/console/lib/purk/irc.py
@@ -54,7 +54,6 @@ class Network(object):
     
     def __init__(self, core, server="irc.default.org", port=6667, nicks=[], 
                     username="", fullname="", name=None, **kwargs):
-        self.core = core
         self.manager = core.manager
         self.server = server
         self.port = port
@@ -132,7 +131,7 @@ class Network(object):
             self.disconnect(error=error[1])
             #we should immediately retry if we failed to open the socket and there are hosts left
             if self.status == DISCONNECTED and not self.failedlasthost:
-                windows.get_default(self, self.core.manager).write("* Retrying with next available host")
+                windows.get_default(self).write("* Retrying with next available host")
                 self.connect()
         else:
             self.source = source = ui.Source()
@@ -144,10 +143,6 @@ class Network(object):
             if source.enabled:
                 self.source = ui.fork(self.on_read, self.socket.recv, 8192)
         
-        # Auto join channels on connect
-        for channel in self.core.channels:
-            self.core.run_command("/join %s" % channel)
-
     #called when we read data or failed to read data
     def on_read(self, result, error):
         if error:
@@ -169,7 +164,7 @@ class Network(object):
             
             if source.enabled:
                 self.source = ui.fork(self.on_read, self.socket.recv, 8192)    
-
+    
     def raw(self, msg):
         self.events.trigger("OwnRaw", network=self, raw=msg)
         
--
cgit v0.9.1