Changeset 1811:1238cb8326fa

Show
Ignore:
Timestamp:
05/04/09 13:46:12 (16 months ago)
Author:
Ronny Pfannschmidt <Ronny.Pfannschmidt@…>
Branch:
default
Parents:
1802:0d0bfa938334 (diff), 1810:402e5f03f37c (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:

merged

Files:
2 modified

Legend:

Unmodified
Added
Removed
  • pida/core/pdbus.py

    r1801 r1811  
    223223                    _method_reply_error(connection, message, exception) 
    224224                return 
     225            elif method_name == 'CONFIG_CHANGED' or \ 
     226                 method_name == 'CONFIG_EXTRA_CHANGED': 
     227                    return 
    225228        # do a normal lookup 
    226229        return super(DbusOptionsManagerReal, self)._message_cb(connection, message) 
  • pida/core/pdbus.py

    r1806 r1811  
    261261 
    262262class DbusOptionsManagerNoop(object): 
     263 
     264    def __init__(self, service): 
     265        pass 
     266 
    263267    def unload(self): 
    264268        pass