Imported Upstream version 0.79.3upstream/0.79.3

3 files changed, 20 insertions, 13 deletions

diff --git a/configure b/configure
index 9fe9231..1249f39 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Sugar Presence Service 0.79.2.
+# Generated by GNU Autoconf 2.61 for Sugar Presence Service 0.79.3.
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='Sugar Presence Service'
 PACKAGE_TARNAME='sugar-presence-service'
-PACKAGE_VERSION='0.79.2'
-PACKAGE_STRING='Sugar Presence Service 0.79.2'
+PACKAGE_VERSION='0.79.3'
+PACKAGE_STRING='Sugar Presence Service 0.79.3'
 PACKAGE_BUGREPORT=''
 
 ac_unique_file="src/sugar-presence-service.in"
@@ -1152,7 +1152,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Sugar Presence Service 0.79.2 to adapt to many kinds of systems.
+\`configure' configures Sugar Presence Service 0.79.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1218,7 +1218,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Sugar Presence Service 0.79.2:";;
+     short | recursive ) echo "Configuration of Sugar Presence Service 0.79.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1282,7 +1282,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Sugar Presence Service configure 0.79.2
+Sugar Presence Service configure 0.79.3
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1296,7 +1296,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Sugar Presence Service $as_me 0.79.2, which was
+It was created by Sugar Presence Service $as_me 0.79.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -1972,7 +1972,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='sugar-presence-service'
- VERSION='0.79.2'
+ VERSION='0.79.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2686,7 +2686,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Sugar Presence Service $as_me 0.79.2, which was
+This file was extended by Sugar Presence Service $as_me 0.79.3, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -2729,7 +2729,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-Sugar Presence Service config.status 0.79.2
+Sugar Presence Service config.status 0.79.3
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
diff --git a/configure.ac b/configure.ac
index 554fbff..383ed93 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Sugar Presence Service],[0.79.2],[],[sugar-presence-service])
+AC_INIT([Sugar Presence Service],[0.79.3],[],[sugar-presence-service])
 
 AC_PREREQ([2.59])
 
diff --git a/src/telepathy_plugin.py b/src/telepathy_plugin.py
index b4581d8..c85bdd1 100644
--- a/src/telepathy_plugin.py
+++ b/src/telepathy_plugin.py
@@ -179,6 +179,7 @@ class TelepathyPlugin(gobject.GObject):
         """Attempt to reconnect to the server after the back-off time has
         elapsed.
         """
+        _logger.debug("%r: reconnect timed out. Let's try to connect", self)
         if self._backoff_id > 0:
             gobject.source_remove(self._backoff_id)
             self._backoff_id = 0
@@ -192,6 +193,8 @@ class TelepathyPlugin(gobject.GObject):
         if self._backoff_id != 0:
             gobject.source_remove(self._backoff_id)
 
+        _logger.debug("%r: restart reconnect time out (%u seconds)",
+                self, self._reconnect_timeout / 1000)
         self._backoff_id = gobject.timeout_add(self._reconnect_timeout,
                 self._reconnect_cb)
 
@@ -209,9 +212,13 @@ class TelepathyPlugin(gobject.GObject):
         if there is an existing connection, reuse it by
         registering for various of events on it.
         """
+        _logger.debug('%r: init connection', self)
         conn = self._find_existing_connection()
         if not conn:
+            _logger.debug('%r: no existing connection. Create a new one', self)
             conn = self._make_new_connection()
+        else:
+            _logger.debug('%r: found existing connection. Reuse it', self)
 
         m = conn[CONN_INTERFACE].connect_to_signal('StatusChanged',
            self._handle_connection_status_change)
@@ -286,14 +293,14 @@ class TelepathyPlugin(gobject.GObject):
             _logger.debug("%r: disconnected (reason %r)", self, reason)
             if reason == CONNECTION_STATUS_REASON_AUTHENTICATION_FAILED:
                 # FIXME: handle connection failure; retry later?
+                _logger.debug("%r: authentification failed. Give up ", self)
                 pass
             else:
                 # Try again later. We'll detect whether we have a network
                 # connection after the retry period elapses. The fact that
                 # this timer is running also serves as a marker to indicate
                 # that we shouldn't try to go back online yet.
-                if self._backoff_id:
-                    self._reset_reconnect_timer()
+                self._reset_reconnect_timer()
 
         self.emit('status', self._conn_status, int(reason))