nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-20 21:29:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated to current hg head of mumble-django

Browse Source
This commit is contained in:
Andrew Williams
2010-03-23 10:00:05 +00:00
parent edc5def1f3
commit d2b47da704
57 changed files with 6102 additions and 339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
mumble/MumbleCtlDbus.py
View File

@@ -69,7 +69,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
info[str(key)] = conf[key];
return info;
def getConf(self, srvid, key, value):
def getConf(self, srvid, key):
if key == "username":
key = "playername";
@@ -125,9 +125,10 @@ class MumbleCtlDbus_118(MumbleCtlBase):
ret = {};
for channel in chans:
print channel;
ret[ channel[0] ] = ObjectInfo(
id = int(channel[0]),
name = str(channel[1]),
name = unicode(channel[1]),
parent = int(channel[2]),
links = [ int(lnk) for lnk in channel[3] ],
);
@@ -149,7 +150,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
selfDeaf = bool( playerObj[5] ),
channel = int( playerObj[6] ),
userid = int( playerObj[7] ),
name = str( playerObj[8] ),
name = unicode( playerObj[8] ),
onlinesecs = int( playerObj[9] ),
bytespersec = int( playerObj[10] )
);
@@ -178,7 +179,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
applySubs = bool(rule[1]),
inherited = bool(rule[2]),
userid = int(rule[3]),
group = str(rule[4]),
group = unicode(rule[4]),
allow = int(rule[5]),
deny = int(rule[6]),
)
@@ -186,7 +187,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
];
groups = [ ObjectInfo(
name = str(group[0]),
name = unicode(group[0]),
inherited = bool(group[1]),
inherit = bool(group[2]),
inheritable = bool(group[3]),
@@ -261,7 +262,7 @@ class MumbleCtlDbus_118(MumbleCtlBase):
def setTexture(self, srvid, mumbleid, infile):
# open image, convert to RGBA, and resize to 600x60
img = Image.open( infile ).convert( "RGBA" ).transform( ( 600, 60 ), Image.EXTENT, ( 0, 0, 600, 60 ) );
img = infile.convert( "RGBA" ).transform( ( 600, 60 ), Image.EXTENT, ( 0, 0, 600, 60 ) );
# iterate over the list and pack everything into a string
bgrastring = "";
for ent in list( img.getdata() ):