summaryrefslogtreecommitdiff
path: root/sunshine
diff options
context:
space:
mode:
authorKrzysztof <kkszysiu@gmail.com>2011-03-27 16:34:25 +0200
committerKrzysztof <kkszysiu@gmail.com>2011-03-27 16:34:25 +0200
commitea371ef3cf7ba52fabf3acf78d95235d945c623a (patch)
treeb348c75c6ab2259902c5f046a4fc603f2eef351b /sunshine
parent94f7a69b88912af946e0bc06c9b99aae1de23761 (diff)
Revert "Sunshine should now work on twisted versions older than 0.9.0 but with disabled functions like avatar uploading and contact info."
Diffstat (limited to 'sunshine')
-rw-r--r--sunshine/connection.py6
-rw-r--r--sunshine/lqsoft/gaduapi.py1
2 files changed, 3 insertions, 4 deletions
diff --git a/sunshine/connection.py b/sunshine/connection.py
index 7ac119f..935fe59 100644
--- a/sunshine/connection.py
+++ b/sunshine/connection.py
@@ -185,8 +185,7 @@ class SunshineConnection(telepathy.server.Connection,
logger.info("We have %s contacts in file." % (self.configfile.get_contacts_count()))
self.factory = GaduClientFactory(self.profile)
- if check_requirements() == True:
- self.ggapi = GG_Oauth(self.profile.uin, parameters['password'])
+ self.ggapi = GG_Oauth(self.profile.uin, parameters['password'])
self._channel_manager = SunshineChannelManager(self)
@@ -202,8 +201,7 @@ class SunshineConnection(telepathy.server.Connection,
SunshineAliasing.__init__(self)
SunshineAvatars.__init__(self)
SunshineCapabilities.__init__(self)
- if check_requirements() == True:
- SunshineContactInfo.__init__(self)
+ SunshineContactInfo.__init__(self)
SunshineContacts.__init__(self)
self.updateCapabilitiesCalls()
diff --git a/sunshine/lqsoft/gaduapi.py b/sunshine/lqsoft/gaduapi.py
index 3ed358d..ec31567 100644
--- a/sunshine/lqsoft/gaduapi.py
+++ b/sunshine/lqsoft/gaduapi.py
@@ -347,6 +347,7 @@ class GG_Oauth(object):
def cbShutdown(self, reason):
logger.info("Something went wrong: %s" % (reason))
+ #print 'cbShutdown: ', reason
def checkTokenForAvatar(self, data, ext):
if debug_mode: