Merge branch 'develop' of github.com:fritzy/SleekXMPP into develop

This commit is contained in:
Lance Stout 2011-08-30 23:11:11 -07:00
commit 628978fc8c

View file

@ -221,9 +221,7 @@ class Options(ElementBase):
def getOptions(self): def getOptions(self):
config = self.xml.find('{jabber:x:data}x') config = self.xml.find('{jabber:x:data}x')
form = xep_0004.Form() form = xep_0004.Form(xml=config)
if config is not None:
form.fromXML(config)
return form return form
def setOptions(self, value): def setOptions(self, value):
@ -254,9 +252,7 @@ class PublishOptions(ElementBase):
def get_publish_options(self): def get_publish_options(self):
config = self.xml.find('{jabber:x:data}x') config = self.xml.find('{jabber:x:data}x')
form = xep_0004.Form() form = xep_0004.Form(xml=config)
if config is not None:
form.fromXML(config)
return form return form
def set_publish_options(self, value): def set_publish_options(self, value):