From 84d480ff8c4ec675a8f478401ea74a65e26fe6d0 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Tue, 9 Nov 2010 22:48:27 +0100 Subject: [PATCH] fix a few issues with murmur 1.1.4 (yep, srsly\!) --- pyweb/mumble/MumbleCtlDbus.py | 6 ++++++ pyweb/mumble/mmobjects.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pyweb/mumble/MumbleCtlDbus.py b/pyweb/mumble/MumbleCtlDbus.py index 1e9de50..3c29798 100644 --- a/pyweb/mumble/MumbleCtlDbus.py +++ b/pyweb/mumble/MumbleCtlDbus.py @@ -312,6 +312,12 @@ class MumbleCtlDbus_118(MumbleCtlBase): def removeChannel( self, srvid, 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 ): srv = self._getDbusServerObject(srvid) state = srv.getChannelState(channelid) diff --git a/pyweb/mumble/mmobjects.py b/pyweb/mumble/mmobjects.py index 3310c96..6c30165 100644 --- a/pyweb/mumble/mmobjects.py +++ b/pyweb/mumble/mmobjects.py @@ -306,7 +306,8 @@ class mmPlayer( object ): pldata = self.player_obj.__dict__.copy() if authed: - pldata["x_addrstring"] = self.ipaddress + if "ipaddress" in self.player_obj: + pldata["x_addrstring"] = self.ipaddress else: del pldata["address"]