escape does not close the GC and a bugfix for gc user.show
This commit is contained in:
parent
d8aeac2fbb
commit
73e506f5b1
|
@ -59,8 +59,6 @@ class Groupchat_window(chat.Chat):
|
||||||
self.on_set_button_clicked)
|
self.on_set_button_clicked)
|
||||||
self.xml.signal_connect('on_configure_button_clicked', \
|
self.xml.signal_connect('on_configure_button_clicked', \
|
||||||
self.on_configure_button_clicked)
|
self.on_configure_button_clicked)
|
||||||
self.xml.signal_connect('on_groupchat_window_key_press_event', \
|
|
||||||
self.on_groupchat_window_key_press_event)
|
|
||||||
|
|
||||||
def on_groupchat_window_delete_event(self, widget, event):
|
def on_groupchat_window_delete_event(self, widget, event):
|
||||||
"""close window"""
|
"""close window"""
|
||||||
|
@ -227,7 +225,7 @@ class Groupchat_window(chat.Chat):
|
||||||
else:
|
else:
|
||||||
roster = self.plugin.roster
|
roster = self.plugin.roster
|
||||||
state_images = roster.get_appropriate_state_images(jid)
|
state_images = roster.get_appropriate_state_images(jid)
|
||||||
image = state_images[user.show]
|
image = state_images[show]
|
||||||
model.set_value(iter, 0, image)
|
model.set_value(iter, 0, image)
|
||||||
model.set_value(iter, 3, show)
|
model.set_value(iter, 3, show)
|
||||||
|
|
||||||
|
@ -382,7 +380,6 @@ class Groupchat_window(chat.Chat):
|
||||||
dialogs.Vcard_window(jid, self.plugin,
|
dialogs.Vcard_window(jid, self.plugin,
|
||||||
self.account, True)
|
self.account, True)
|
||||||
gajim.connections[self.account].request_vcard(jid)
|
gajim.connections[self.account].request_vcard(jid)
|
||||||
#FIXME: maybe use roster.on_info above?
|
|
||||||
|
|
||||||
#FIXME: we need the resource but it's not saved
|
#FIXME: we need the resource but it's not saved
|
||||||
#self.plugin.send('ASK_OS_INFO', self.account, jid, resource)
|
#self.plugin.send('ASK_OS_INFO', self.account, jid, resource)
|
||||||
|
@ -501,10 +498,6 @@ class Groupchat_window(chat.Chat):
|
||||||
self.redraw_tab(room_jid)
|
self.redraw_tab(room_jid)
|
||||||
self.show_title()
|
self.show_title()
|
||||||
|
|
||||||
def on_groupchat_window_key_press_event(self, widget, event):
|
|
||||||
if event.keyval == gtk.keysyms.Escape:
|
|
||||||
widget.get_toplevel().destroy()
|
|
||||||
|
|
||||||
def on_list_treeview_button_press_event(self, widget, event):
|
def on_list_treeview_button_press_event(self, widget, event):
|
||||||
"""popup user's group's or agent menu"""
|
"""popup user's group's or agent menu"""
|
||||||
if event.type == gtk.gdk.BUTTON_PRESS:
|
if event.type == gtk.gdk.BUTTON_PRESS:
|
||||||
|
|
637
src/gtkgui.glade
637
src/gtkgui.glade
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue