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

fix some GTK calls

Browse source
This commit is contained in:
Yann Leboulanger 2012-12-26 11:19:36 +01:00
parent 4554b85922
commit 11f661a3ed
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/dialogs.py
View file

@ -235,7 +235,7 @@ class PassphraseDialog:
cancelbutton.connect('clicked', self.on_cancelbutton_clicked) cancelbutton.connect('clicked', self.on_cancelbutton_clicked)
self.xml.connect_signals(self) self.xml.connect_signals(self)
self.set_transient_for(gajim.interface.roster.window) self.window.set_transient_for(gajim.interface.roster.window)
self.window.show_all() self.window.show_all()
self.check = bool(checkbuttontext) self.check = bool(checkbuttontext)

9
src/roster_window.py
View file

@ -2279,7 +2279,7 @@ class RosterWindow:
else: else:
# No need to redraw contacts if we're quitting # No need to redraw contacts if we're quitting
if child_iterA: if child_iterA:
self.model[child_iterA][C_AVATAR_PIXBUF] = None self.model[child_iterA][C_AVATAR_PIXBUF] = ''
if account in gajim.con_types: if account in gajim.con_types:
gajim.con_types[account] = None gajim.con_types[account] = None
for jid in gajim.contacts.get_jid_list(account): for jid in gajim.contacts.get_jid_list(account):
@ -2343,10 +2343,12 @@ class RosterWindow:
table = {'offline':9, 'connecting':9, 'online':0, 'chat':1, 'away':2, table = {'offline':9, 'connecting':9, 'online':0, 'chat':1, 'away':2,
'xa':3, 'dnd':4, 'invisible':5} 'xa':3, 'dnd':4, 'invisible':5}
liststore = self.status_combobox.get_model()
# we check if there are more options in the combobox that it should # we check if there are more options in the combobox that it should
# if yes, we remove the first ones # if yes, we remove the first ones
while len(self.status_combobox.get_model()) > len(table)+2: while len(liststore) > len(table)+2:
self.status_combobox.remove_text(0) titer = liststore.get_iter_first()
liststore.remove(titer)
show = helpers.get_global_show() show = helpers.get_global_show()
# temporarily block signal in order not to send status that we show # temporarily block signal in order not to send status that we show
@ -2356,7 +2358,6 @@ class RosterWindow:
self.status_combobox.set_active(table[show]) self.status_combobox.set_active(table[show])
else: else:
uf_show = helpers.get_uf_show(show) uf_show = helpers.get_uf_show(show)
liststore = self.status_combobox.get_model()
liststore.prepend(['SEPARATOR', None, '', True]) liststore.prepend(['SEPARATOR', None, '', True])
status_combobox_text = uf_show + ' (' + _("desync'ed") +')' status_combobox_text = uf_show + ' (' + _("desync'ed") +')'
liststore.prepend([status_combobox_text, liststore.prepend([status_combobox_text,