Changeset 5ffa4f7


Ignore:
Timestamp:
2012-07-20T22:18:08Z (8 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
809cd37
Parents:
7d2ce9a (diff), 1a0b734 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge from vmiklos, should fox #979.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/skyped.py

    r7d2ce9a r5ffa4f7  
    120120                c = skype.skype.Command("PING", Block=True)
    121121                skype.skype.SendCommand(c)
    122         except Skype4Py.SkypeAPIError, s:
     122        except (Skype4Py.SkypeAPIError, AttributeError), s:
    123123                dprint("Warning, pinging Skype failed (%s)." % (s))
     124                time.sleep(1)
    124125        return True
    125126
Note: See TracChangeset for help on using the changeset viewer.