Changeset 2ff0f37 for protocols/skype


Ignore:
Timestamp:
2011-06-29T23:25:02Z (9 years ago)
Author:
Miklos Vajna <vmiklos@…>
Branches:
master
Children:
66911fc
Parents:
bf8ee39
Message:

skyped: user configuration should have priority

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/skype/skyped.py

    rbf8ee39 r2ff0f37  
    336336        def __init__(self):
    337337                self.cfgpath = os.path.join(os.environ['HOME'], ".skyped", "skyped.conf")
    338                 # for backwards compatibility
     338                # fall back to system-wide settings
    339339                self.syscfgpath = "/usr/local/etc/skyped/skyped.conf"
    340                 if os.path.exists(self.syscfgpath):
     340                if os.path.exists(self.syscfgpath) and not os.path.exists(self.cfgpath):
    341341                        self.cfgpath = self.syscfgpath
    342342                self.daemon = True
Note: See TracChangeset for help on using the changeset viewer.