summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKrzysztof Klinikowski <kkszysiu@gmail.com>2010-09-05 23:34:08 +0200
committerKrzysztof Klinikowski <kkszysiu@gmail.com>2010-09-05 23:34:08 +0200
commit164304aa271f62bf0888e330484470a7432b56b5 (patch)
tree075df63634e5562fd0adf3d6f8c7356bfff5e4aa
parent9f7c58fe538f6d2054393797f0fc671b78cd14c4 (diff)
Sunshine should now work on twisted versions older than 0.9.0 but with disabled functions like avatar uploading and contact info.
-rw-r--r--sunshine/connection.py6
-rw-r--r--sunshine/lqsoft/gaduapi.py1
2 files changed, 4 insertions, 3 deletions
diff --git a/sunshine/connection.py b/sunshine/connection.py
index 935fe59..7ac119f 100644
--- a/sunshine/connection.py
+++ b/sunshine/connection.py
@@ -185,7 +185,8 @@ class SunshineConnection(telepathy.server.Connection,
logger.info("We have %s contacts in file." % (self.configfile.get_contacts_count()))
self.factory = GaduClientFactory(self.profile)
- self.ggapi = GG_Oauth(self.profile.uin, parameters['password'])
+ if check_requirements() == True:
+ self.ggapi = GG_Oauth(self.profile.uin, parameters['password'])
self._channel_manager = SunshineChannelManager(self)
@@ -201,7 +202,8 @@ class SunshineConnection(telepathy.server.Connection,
SunshineAliasing.__init__(self)
SunshineAvatars.__init__(self)
SunshineCapabilities.__init__(self)
- SunshineContactInfo.__init__(self)
+ if check_requirements() == True:
+ SunshineContactInfo.__init__(self)
SunshineContacts.__init__(self)
self.updateCapabilitiesCalls()
diff --git a/sunshine/lqsoft/gaduapi.py b/sunshine/lqsoft/gaduapi.py
index ec31567..3ed358d 100644
--- a/sunshine/lqsoft/gaduapi.py
+++ b/sunshine/lqsoft/gaduapi.py
@@ -347,7 +347,6 @@ 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: