/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
77
77
        SO_BINDTODEVICE = None
78
78
 
79
79
 
80
 
version = "1.0.11"
 
80
version = "1.0.12"
81
81
 
82
82
logger = logging.Logger(u'mandos')
83
83
syslogger = (logging.handlers.SysLogHandler
174
174
                                    self.server.EntryGroupNew()),
175
175
                avahi.DBUS_INTERFACE_ENTRY_GROUP)
176
176
            self.group.connect_to_signal('StateChanged',
177
 
                                         self.entry_group_state_changed)
 
177
                                         self
 
178
                                         .entry_group_state_changed)
178
179
        logger.debug(u"Adding Zeroconf service '%s' of type '%s' ...",
179
180
                     self.name, self.type)
180
181
        self.group.AddService(
702
703
        self.interval = datetime.timedelta(0, 0, 0, milliseconds)
703
704
        # Emit D-Bus signal
704
705
        self.PropertyChanged(dbus.String(u"interval"),
705
 
                             (dbus.UInt64(self.interval_milliseconds(),
 
706
                             (dbus.UInt64(self
 
707
                                          .interval_milliseconds(),
706
708
                                          variant_level=1)))
707
709
    
708
710
    # SetSecret - method
983
985
        clients:        set of Client objects
984
986
        gnutls_priority GnuTLS priority string
985
987
        use_dbus:       Boolean; to emit D-Bus signals or not
986
 
        clients:        set of Client objects
987
 
        gnutls_priority GnuTLS priority string
988
 
        use_dbus:       Boolean; to emit D-Bus signals or not
989
988
    
990
989
    Assumes a gobject.MainLoop event loop.
991
990
    """
1172
1171
 
1173
1172
def main():
1174
1173
    
1175
 
    ######################################################################
 
1174
    ##################################################################
1176
1175
    # Parsing of options, both command line and config file
1177
1176
    
1178
1177
    parser = optparse.OptionParser(version = "%%prog %s" % version)