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

always update self.previous_status_combobox_active, even when we don't manually change the combobox

This commit is contained in:
Yann Leboulanger 2005-11-05 18:09:57 +00:00
parent 51d2175b18
commit 79d611032a
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gtkgui.glade
View File

@ -391,6 +391,7 @@
<property name="visible">True</property>
<property name="add_tearoffs">False</property>
<property name="focus_on_click">True</property>
<signal name="changed" handler="on_status_combobox_changed" last_modification_time="Sat, 05 Nov 2005 18:07:49 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@ -13894,6 +13895,7 @@ to the Jabber network.</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">username_entry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>

14
src/roster_window.py
View File

@ -1405,6 +1405,9 @@ _('If "%s" accepts this request you will know his status.') %jid)
active = self.status_combobox.get_active()
if active == -1: # no active item
return
if not self.combobox_callback_active:
self.previous_status_combobox_active = active
return
accounts = gajim.connections.keys()
if len(accounts) == 0:
dialogs.ErrorDialog(_('No account available'),
@ -1426,9 +1429,9 @@ _('If "%s" accepts this request you will know his status.') %jid)
continue
current_show = gajim.SHOW_LIST[gajim.connections[acct].connected]
self.send_status(acct, current_show, message)
self.status_combobox.handler_block(self.id_signal_cb)
self.combobox_callback_active = False
self.status_combobox.set_active(self.previous_status_combobox_active)
self.status_combobox.handler_unblock(self.id_signal_cb)
self.combobox_callback_active = True
return
# we are about to change show, so save this new show so in case
# after user chooses "Change status message" menuitem
@ -1472,9 +1475,9 @@ _('If "%s" accepts this request you will know his status.') %jid)
maxi = gajim.connections[account].connected
# temporarily block signal in order not to send status that we show
# in the combobox
self.status_combobox.handler_block(self.id_signal_cb)
self.combobox_callback_active = False
self.status_combobox.set_active(table[maxi])
self.status_combobox.handler_unblock(self.id_signal_cb)
self.combobox_callback_active = True
statuss = ['offline', 'connecting', 'online', 'chat', 'away',
'xa', 'dnd', 'invisible']
if gajim.interface.systray_enabled:
@ -2475,8 +2478,7 @@ _('If "%s" accepts this request you will know his status.') %jid)
self.tree.connect('drag_data_get', self.drag_data_get_data)
self.tree.connect('drag_data_received', self.drag_data_received_data)
self.xml.signal_autoconnect(self)
self.id_signal_cb = self.status_combobox.connect('changed',
self.on_status_combobox_changed)
self.combobox_callback_active = True
self.collapsed_rows = gajim.config.get('collapsed_rows').split('\t')
self.tooltip = tooltips.RosterTooltip()