From 60d192fc96e3bc88e06cd8d9e3e87524d3347402 Mon Sep 17 00:00:00 2001
From: Michael Ziegler <diese-addy@funzt-halt.net>
Date: Sat, 13 Feb 2010 13:05:37 +0100
Subject: [PATCH] add getConf method

---
 pyweb/mumble/MumbleCtlDbus.py |  6 ++++++
 pyweb/mumble/MumbleCtlIce.py  | 11 +++++++++++
 pyweb/mumble/mctl.py          |  3 +++
 3 files changed, 20 insertions(+)

diff --git a/pyweb/mumble/MumbleCtlDbus.py b/pyweb/mumble/MumbleCtlDbus.py
index b5204a3..5684d36 100644
--- a/pyweb/mumble/MumbleCtlDbus.py
+++ b/pyweb/mumble/MumbleCtlDbus.py
@@ -69,6 +69,12 @@ class MumbleCtlDbus_118(MumbleCtlBase):
 				info[str(key)] = conf[key];
 		return info;
 	
+	def getConf(self, srvid, key, value):
+		if key == "username":
+			key = "playername";
+		
+		return self.meta.getConf(dbus.Int32( srvid ), key)
+	
 	def setConf(self, srvid, key, value):
 		if key == "username":
 			key = "playername";
diff --git a/pyweb/mumble/MumbleCtlIce.py b/pyweb/mumble/MumbleCtlIce.py
index 7503607..354228a 100644
--- a/pyweb/mumble/MumbleCtlIce.py
+++ b/pyweb/mumble/MumbleCtlIce.py
@@ -201,6 +201,13 @@ class MumbleCtlIce_118(MumbleCtlBase):
 	def setSuperUserPassword(self, srvid, value):
 		self._getIceServerObject(srvid).setSuperuserPassword( value.encode( "UTF-8" ) )
 	
+	@protectDjangoErrPage
+	def getConf(self, srvid, key):
+		if key == "username":
+			key = "playername";
+		
+		return self._getIceServerObject(srvid).getConf( key )
+	
 	@protectDjangoErrPage
 	def setConf(self, srvid, key, value):
 		if key == "username":
@@ -408,6 +415,10 @@ class MumbleCtlIce_120(MumbleCtlIce_118):
 		
 		return info;
 	
+	@protectDjangoErrPage
+	def getConf(self, srvid, key):
+		return self._getIceServerObject(srvid).getConf( key )
+	
 	@protectDjangoErrPage
 	def setConf(self, srvid, key, value):
 		self._getIceServerObject(srvid).setConf( key, value.encode( "UTF-8" ) )
diff --git a/pyweb/mumble/mctl.py b/pyweb/mumble/mctl.py
index da2fff2..502aff1 100644
--- a/pyweb/mumble/mctl.py
+++ b/pyweb/mumble/mctl.py
@@ -28,6 +28,9 @@ class MumbleCtlBase (object):
 	def getVersion( self ):
 		raise NotImplementedError( "mctl::getVersion" );
 	
+	def getConf(self, srvid, key):
+		raise NotImplementedError( "mctl::getConf" );
+	
 	def setConf(self, srvid, key, value):
 		raise NotImplementedError( "mctl::setConf" );