don't change status when we close the awayMessage window
This commit is contained in:
parent
609ab74902
commit
2ab2f09e0e
|
@ -504,11 +504,12 @@ class awayMsg_Window:
|
||||||
def run(self):
|
def run(self):
|
||||||
"""Wait for Ok button to be pressed and return away messsage"""
|
"""Wait for Ok button to be pressed and return away messsage"""
|
||||||
rep = self.xml.get_widget("Away_msg").run()
|
rep = self.xml.get_widget("Away_msg").run()
|
||||||
msg = ''
|
|
||||||
if rep == gtk.RESPONSE_OK:
|
if rep == gtk.RESPONSE_OK:
|
||||||
beg, end = self.txtBuffer.get_bounds()
|
beg, end = self.txtBuffer.get_bounds()
|
||||||
msg = self.txtBuffer.get_text(beg, end, 0)
|
msg = self.txtBuffer.get_text(beg, end, 0)
|
||||||
self.xml.get_widget("Away_msg").destroy()
|
else:
|
||||||
|
msg = -1
|
||||||
|
self.xml.get_widget("Away_msg").destroy()
|
||||||
return msg
|
return msg
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -1598,9 +1599,11 @@ class roster_Window:
|
||||||
if status != 'online' and status != 'offline':
|
if status != 'online' and status != 'offline':
|
||||||
w = awayMsg_Window()
|
w = awayMsg_Window()
|
||||||
txt = w.run()
|
txt = w.run()
|
||||||
|
if txt != -1:
|
||||||
|
self.plugin.send('STATUS', account, (status, txt))
|
||||||
else:
|
else:
|
||||||
txt = status
|
txt = status
|
||||||
self.plugin.send('STATUS', account, (status, txt))
|
self.plugin.send('STATUS', account, (status, txt))
|
||||||
|
|
||||||
def on_optionmenu_changed(self, widget):
|
def on_optionmenu_changed(self, widget):
|
||||||
"""When we change our status"""
|
"""When we change our status"""
|
||||||
|
@ -1610,6 +1613,9 @@ class roster_Window:
|
||||||
if status != 'online' and status != 'offline':
|
if status != 'online' and status != 'offline':
|
||||||
w = awayMsg_Window()
|
w = awayMsg_Window()
|
||||||
txt = w.run()
|
txt = w.run()
|
||||||
|
if txt == -1:
|
||||||
|
self.set_optionmenu()
|
||||||
|
return
|
||||||
else:
|
else:
|
||||||
txt = status
|
txt = status
|
||||||
accounts = self.plugin.accounts.keys()
|
accounts = self.plugin.accounts.keys()
|
||||||
|
|
Loading…
Reference in New Issue