Browse Source

fix a few issues with murmur 1.1.4 (yep, srsly\!)

Natenom/support-murmur-13-1446181288462
Michael Ziegler 14 years ago
parent
commit
84d480ff8c
  1. 6
      pyweb/mumble/MumbleCtlDbus.py
  2. 1
      pyweb/mumble/mmobjects.py

6
pyweb/mumble/MumbleCtlDbus.py

@ -312,6 +312,12 @@ class MumbleCtlDbus_118(MumbleCtlBase):
def removeChannel( self, srvid, channelid ): def removeChannel( self, srvid, channelid ):
return self._getDbusServerObject(srvid).removeChannel( channelid ) return self._getDbusServerObject(srvid).removeChannel( channelid )
def getLog( self, srvid, first=0, last=100 ):
return []
def getBans( self, srvid ):
return self._getDbusServerObject(srvid).getBans()
def renameChannel( self, srvid, channelid, name, description ): def renameChannel( self, srvid, channelid, name, description ):
srv = self._getDbusServerObject(srvid) srv = self._getDbusServerObject(srvid)
state = srv.getChannelState(channelid) state = srv.getChannelState(channelid)

1
pyweb/mumble/mmobjects.py

@ -306,6 +306,7 @@ class mmPlayer( object ):
pldata = self.player_obj.__dict__.copy() pldata = self.player_obj.__dict__.copy()
if authed: if authed:
if "ipaddress" in self.player_obj:
pldata["x_addrstring"] = self.ipaddress pldata["x_addrstring"] = self.ipaddress
else: else:
del pldata["address"] del pldata["address"]

Loading…
Cancel
Save