Changeset 755

Show
Ignore:
Timestamp:
08/03/08 08:14:34 (4 months ago)
Author:
sylvain
Message:

Reverted logger to the jlib widget

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • oss/jlib/examples/basic/client.py

    r754 r755  
    3737 
    3838        self.logger = jlibLogger() 
    39         #self.logger.setComponent(jlibLoggerComponent()) 
     39        self.logger.setComponent(jlibLoggerComponent()) 
    4040        QtCore.QObject.connect(self.actionShowLog, QtCore.SIGNAL("toggled(bool)"), 
    4141                               self.changeLogAreaView) 
    42         #QtCore.QObject.connect(self.logger, QtCore.SIGNAL("logData(PyQt_PyObject)"), 
    43         #                       self.logData) 
     42        QtCore.QObject.connect(self.logger, QtCore.SIGNAL("logData(PyQt_PyObject)"), 
     43                               self.logData) 
    4444 
    4545        self.toolBox.setItemText(0, "Contacts") 
    …… 
    7575        self.connection.emit(QtCore.SIGNAL("activateChat()")) 
    7676        self.connection.emit(QtCore.SIGNAL("activatePubSub(PyQt_PyObject)"), unicode(self.options.pubsub)) 
    77         #self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.logger) 
     77        self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.logger) 
    7878        self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.contactUi.contact) 
    7979        self.connection.emit(QtCore.SIGNAL("registerLinkages(PyQt_PyObject)"), self.contactUi.presence) 
    …… 
    123123        QtCore.QObject.connect(disco, QtCore.SIGNAL("receivedSubscriptions(PyQt_PyObject)"), 
    124124                               self.setSubscriptionsModel) 
    125         #disco.emit(QtCore.SIGNAL("discoverSubscriptions()")) 
     125        disco.emit(QtCore.SIGNAL("discoverSubscriptions()")) 
    126126        if self.options.rootnode: 
    127127            disco.emit(QtCore.SIGNAL("discoverNodeInformation(PyQt_PyObject)"),  

  • oss/jlib/jlib/core/pubsub.py

    r754 r755  
    9999               "subscriptions.result": "", 
    100100               "subscriptions.error": "", 
     101 
    101102               "affiliations.result": "", 
     103 
    102104               "information.result": "", 
    103105               "information.error": "", 
     106 
    104107               "features.result": "", 
     108 
    105109               "items.result": "", 
    106110               "items.error" : "",}