149 """ <b>{0}</b>?</p><p>All channels will be closed.""" |
149 """ <b>{0}</b>?</p><p>All channels will be closed.""" |
150 """</p>""").format(self.__server.getName())) |
150 """</p>""").format(self.__server.getName())) |
151 else: |
151 else: |
152 ok = True |
152 ok = True |
153 if ok: |
153 if ok: |
154 self.__socket.blockSignals(True) |
154 self.__connectNetwork("", False, True) |
155 |
|
156 self.__send("QUIT :" + self.__quitMessage) |
|
157 self.__socket.flush() |
|
158 self.__socket.close() |
|
159 self.__socket.deleteLater() |
|
160 self.__socket = None |
|
161 else: |
155 else: |
162 ok = True |
156 ok = True |
163 |
157 |
164 if ok: |
158 if ok: |
165 self.__ircNetworkManager.close() |
159 self.__ircNetworkManager.close() |
|
160 |
166 return ok |
161 return ok |
167 |
162 |
168 def autoConnect(self): |
163 def autoConnect(self): |
169 """ |
164 """ |
170 Public method to initiate the IRC auto connection. |
165 Public method to initiate the IRC auto connection. |
260 self.networkWidget.addServerMessage( |
255 self.networkWidget.addServerMessage( |
261 self.tr("Info"), |
256 self.tr("Info"), |
262 self.tr("Disconnecting from server.")) |
257 self.tr("Disconnecting from server.")) |
263 self.__closeAllChannels() |
258 self.__closeAllChannels() |
264 self.__send("QUIT :" + self.__quitMessage) |
259 self.__send("QUIT :" + self.__quitMessage) |
265 self.__socket and self.__socket.flush() |
260 if self.__socket: |
266 self.__socket and self.__socket.close() |
261 self.__socket.flush() |
|
262 self.__socket.close() |
|
263 if self.__socket: |
|
264 # socket is still existing |
|
265 self.__socket.deleteLater() |
|
266 self.__socket = None |
267 self.__userName = "" |
267 self.__userName = "" |
268 self.__identityName = "" |
268 self.__identityName = "" |
269 self.__quitMessage = "" |
269 self.__quitMessage = "" |
270 |
270 |
271 def __editNetwork(self, name): |
271 def __editNetwork(self, name): |
570 self.networkWidget.addServerMessage(self.tr("Notice"), msg) |
570 self.networkWidget.addServerMessage(self.tr("Notice"), msg) |
571 return True |
571 return True |
572 elif name == "MODE": |
572 elif name == "MODE": |
573 self.__registering = False |
573 self.__registering = False |
574 if ":" in match.group(3): |
574 if ":" in match.group(3): |
575 # :detlev_ MODE detlev_ :+i |
575 # :foo MODE foo :+i |
576 name, modes = match.group(3).split(" :") |
576 name, modes = match.group(3).split(" :") |
577 sourceNick = match.group(1) |
577 sourceNick = match.group(1) |
578 if not self.isChannelName(name): |
578 if not self.isChannelName(name): |
579 if name == self.__nickName: |
579 if name == self.__nickName: |
580 if sourceNick == self.__nickName: |
580 if sourceNick == self.__nickName: |