Browse Source

add dummy getUptime for <1.2.2 murmur CTLs. fixes #107

Natenom/support-murmur-13-1446181288462
Michael Ziegler 15 years ago
parent
commit
faa29eae7b
  1. 3
      pyweb/mumble/MumbleCtlDbus.py
  2. 6
      pyweb/mumble/MumbleCtlIce.py

3
pyweb/mumble/MumbleCtlDbus.py

@ -323,6 +323,9 @@ class MumbleCtlDbus_118(MumbleCtlBase):
(chanid, name, parent, links) = srv.getChannelState(dbus.UInt32(channelid)) (chanid, name, parent, links) = srv.getChannelState(dbus.UInt32(channelid))
srv.setChannelState((chanid, name, parentid, links)) srv.setChannelState((chanid, name, parentid, links))
def getUptime( self, srvid):
return 0
@staticmethod @staticmethod
def convertDbusTypeToNative(data): def convertDbusTypeToNative(data):
#i know dbus.* type is extends python native type. #i know dbus.* type is extends python native type.

6
pyweb/mumble/MumbleCtlIce.py

@ -627,7 +627,7 @@ class MumbleCtlIce_120(MumbleCtlIce_118):
@protectDjangoErrPage @protectDjangoErrPage
def getUptime(self, srvid): def getUptime(self, srvid):
return self._getIceServerObject(srvid).getUptime()
return 0
class MumbleCtlIce_122(MumbleCtlIce_120): class MumbleCtlIce_122(MumbleCtlIce_120):
@ -642,6 +642,10 @@ class MumbleCtlIce_122(MumbleCtlIce_120):
buf.seek(0) buf.seek(0)
self._getIceServerObject(srvid).setTexture(mumbleid, buf.read()) self._getIceServerObject(srvid).setTexture(mumbleid, buf.read())
@protectDjangoErrPage
def getUptime(self, srvid):
return self._getIceServerObject(srvid).getUptime()
class MumbleCtlIce_123(MumbleCtlIce_120): class MumbleCtlIce_123(MumbleCtlIce_120):

Loading…
Cancel
Save