blah!

git-svn-id: http://xapek.org/svn/common/omegle@1482 d0e8fea9-7529-0410-93fb-d39fd5b9c1dd

1 files changed, 6 insertions, 10 deletions

diff --git a/omegle/icqChatroomBuddy.py b/omegle/icqChatroomBuddy.py
index d4c2edc..63689f1 100644
--- a/omegle/icqChatroomBuddy.py
+++ b/omegle/icqChatroomBuddy.py
@@ -1,12 +1,14 @@
 #!/usr/bin/python
 # -*- vim: encoding: utf-8 -*-
+# Yves Fischer, xapek.org 2009
 import sys
 
 from twisted.words.protocols import oscar
 from twisted.internet import reactor, protocol
 from twisted.python import log
 
-from omegle.icqBuddy import OmegleICQ, OscarFactory
+from omegle.icqBuddy import OmegleICQ
+from icq import ReconnectOscarFactory
 
 ICQ_UIN = '446323989'
 ICQ_PASSWORD = 'gagaga'
@@ -20,18 +22,12 @@ class OmegleICQChatroomBuddy( OmegleICQ ):
         self.sendMessage(ICQ_CHATROOM_UID, "/leave")
         OmegleICQ.shutdown(self)
 
-class Authenticator( oscar.OscarAuthenticator ):
-    BOSClass = OmegleICQChatroomBuddy
-    
-class MyOscarFactory(OscarFactory):
-    BOSClass = Authenticator
-
 
 if __name__ == '__main__':
     import logging
     logging.basicConfig(level=logging.INFO)
-
     log.startLogging(sys.stdout)
-    reactor.connectTCP('login.icq.com', 5238,
-                       MyOscarFactory(ICQ_UIN,ICQ_PASSWORD,icq=1))
+
+    factory = ReconnectOscarFactory(OmegleICQChatroomBuddy, ICQ_UIN,ICQ_PASSWORD,icq=1)
+    reactor.connectTCP('login.icq.com', 5238, factory)
     reactor.run()