projects
/
theonering
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bumping to 0.8.3
[theonering]
/
src
/
connection_manager.py
diff --git
a/src/connection_manager.py
b/src/connection_manager.py
index
90252b6
..
d21c8a7
100644
(file)
--- a/
src/connection_manager.py
+++ b/
src/connection_manager.py
@@
-1,19
+1,18
@@
import logging
import logging
-import gobject
import telepathy
import constants
import tp
import telepathy
import constants
import tp
-import gtk_toolbox
+import util.go_utils as gobject_utils
+import util.misc as misc_utils
import connection
import connection
-_moduleLogger = logging.getLogger("connection_manager")
+_moduleLogger = logging.getLogger(__name__)
class TheOneRingConnectionManager(tp.ConnectionManager):
class TheOneRingConnectionManager(tp.ConnectionManager):
- # @bug Crashing Maemo 4.1's RTComm on occasion
def __init__(self, shutdown_func=None):
tp.ConnectionManager.__init__(self, constants._telepathy_implementation_name_)
def __init__(self, shutdown_func=None):
tp.ConnectionManager.__init__(self, constants._telepathy_implementation_name_)
@@
-23,7
+22,7
@@
class TheOneRingConnectionManager(tp.ConnectionManager):
self._on_shutdown = shutdown_func
_moduleLogger.info("Connection manager created")
self._on_shutdown = shutdown_func
_moduleLogger.info("Connection manager created")
- @gtk_toolbox.log_exception(_moduleLogger)
+ @misc_utils.log_exception(_moduleLogger)
def GetParameters(self, proto):
"""
For org.freedesktop.telepathy.ConnectionManager
def GetParameters(self, proto):
"""
For org.freedesktop.telepathy.ConnectionManager
@@
-65,17
+64,17
@@
class TheOneRingConnectionManager(tp.ConnectionManager):
Overrides tp.ConnectionManager
"""
result = tp.ConnectionManager.disconnected(self, conn)
Overrides tp.ConnectionManager
"""
result = tp.ConnectionManager.disconnected(self, conn)
- gobject.timeout_add(5000, self._shutdown)
+ gobject_utils.timeout_add_seconds(5, self._shutdown)
def quit(self):
"""
Terminates all connections. Must be called upon quit
"""
def quit(self):
"""
Terminates all connections. Must be called upon quit
"""
- for connection in self._connections:
- connection.Disconnect()
+ for conn in self._connections:
+ conn.Disconnect()
_moduleLogger.info("Connection manager quitting")
_moduleLogger.info("Connection manager quitting")
- @gtk_toolbox.log_exception(_moduleLogger)
+ @misc_utils.log_exception(_moduleLogger)
def _shutdown(self):
if (
self._on_shutdown is not None and
def _shutdown(self):
if (
self._on_shutdown is not None and