copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quit after unavalable oresence stanza is sent 

(#1937)
This commit is contained in:
Dimitur Kirov 2006-06-12 07:38:07 +00:00
parent 668b98e403
commit 97f66424bd
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/roster_window.py
View File

@ -2046,6 +2046,10 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if accountIter: if accountIter:
model[accountIter][0] = self.jabber_state_images['16'][status] model[accountIter][0] = self.jabber_state_images['16'][status]
if status == 'offline': if status == 'offline':
if self.quit_on_next_offline > -1:
self.quit_on_next_offline -= 1
if self.quit_on_next_offline < 1:
self.quit_gtkgui_interface()
if accountIter: if accountIter:
model[accountIter][C_SECPIXBUF] = None model[accountIter][C_SECPIXBUF] = None
if gajim.con_types.has_key(account): if gajim.con_types.has_key(account):
@ -2316,6 +2320,7 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
else: else:
accounts = gajim.connections.keys() accounts = gajim.connections.keys()
get_msg = False get_msg = False
self.quit_on_next_offline = 0
for acct in accounts: for acct in accounts:
if gajim.connections[acct].connected: if gajim.connections[acct].connected:
get_msg = True get_msg = True
@ -2324,9 +2329,12 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
message = self.get_status_message('offline') message = self.get_status_message('offline')
if message is None: # user pressed Cancel to change status message dialog if message is None: # user pressed Cancel to change status message dialog
message = '' message = ''
for acct in accounts: for acct in accounts:
if gajim.connections[acct].connected: if gajim.connections[acct].connected:
self.quit_on_next_offline += 1
self.send_status(acct, 'offline', message, True) self.send_status(acct, 'offline', message, True)
if not self.quit_on_next_offline:
self.quit_gtkgui_interface() self.quit_gtkgui_interface()
return True # do NOT destory the window return True # do NOT destory the window
@ -2432,10 +2440,15 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
_('Messages will only be available for reading them later if you have history enabled.')) _('Messages will only be available for reading them later if you have history enabled.'))
if dialog.get_response() != gtk.RESPONSE_OK: if dialog.get_response() != gtk.RESPONSE_OK:
return return
self.quit_on_next_offline = 0
for acct in accounts: for acct in accounts:
if gajim.connections[acct].connected: if gajim.connections[acct].connected:
# send status asynchronously # send status asynchronously
self.quit_on_next_offline += 1
self.send_status(acct, 'offline', message, True) self.send_status(acct, 'offline', message, True)
else:
self.quit_on_next_offline = 0
if not self.quit_on_next_offline:
self.quit_gtkgui_interface() self.quit_gtkgui_interface()
def open_event(self, account, jid, event): def open_event(self, account, jid, event):
@ -3323,6 +3336,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
model.set_sort_func(1, self.compareIters) model.set_sort_func(1, self.compareIters)
model.set_sort_column_id(1, gtk.SORT_ASCENDING) model.set_sort_column_id(1, gtk.SORT_ASCENDING)
self.tree.set_model(model) self.tree.set_model(model)
# when this value become 0 we quit main application
self.quit_on_next_offline = -1
self.make_jabber_state_images() self.make_jabber_state_images()
path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports') path = os.path.join(gajim.DATA_DIR, 'iconsets', 'transports')