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

bugfix in contact menu

Browse source
This commit is contained in:
Yann Leboulanger 2005-06-15 07:38:58 +00:00
parent 7bd2cf9d59
commit 9063034cf8
2 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dialogs.py
View file

@ -331,8 +331,8 @@ _('User names must be of the form "user@servername".')).get_response()
end_iter = message_buffer.get_end_iter() end_iter = message_buffer.get_end_iter()
message = message_buffer.get_text(start_iter, end_iter, 0) message = message_buffer.get_text(start_iter, end_iter, 0)
group = self.group_comboboxentry.child.get_text() group = self.group_comboboxentry.child.get_text()
self.plugin.roster.req_sub(self, jid, message, self.account, group, self.plugin.roster.req_sub(self, jid, message, self.account,
nickname) group = group, pseudo = nickname)
if self.xml.get_widget('auto_authorize_checkbutton').get_active(): if self.xml.get_widget('auto_authorize_checkbutton').get_active():
gajim.connections[self.account].send_authorization(jid) gajim.connections[self.account].send_authorization(jid)
self.window.destroy() self.window.destroy()

10
src/roster_window.py
View file

@ -589,7 +589,7 @@ class RosterWindow:
item = gtk.MenuItem(_('Rere_quest Authorization from')) item = gtk.MenuItem(_('Rere_quest Authorization from'))
sub_menu.append(item) sub_menu.append(item)
item.connect('activate', self.req_sub, jid, item.connect('activate', self.req_sub, jid,
_('I would like to add you to my roster'), account, menuitem=True) _('I would like to add you to my roster'), account)
else: else:
item = gtk.MenuItem() item = gtk.MenuItem()
menu.append(item) menu.append(item)
@ -738,8 +738,7 @@ class RosterWindow:
dialogs.InformationDialog(_('Authorization has been sent'), dialogs.InformationDialog(_('Authorization has been sent'),
_('Now "%s" will know when your status.') %jid).get_response() _('Now "%s" will know when your status.') %jid).get_response()
def req_sub(self, widget, jid, txt, account, group=None, pseudo=None,\ def req_sub(self, widget, jid, txt, account, group=None, pseudo=None):
menuitem=False):
'''Request subscription to a user''' '''Request subscription to a user'''
if not pseudo: if not pseudo:
pseudo = jid pseudo = jid
@ -758,14 +757,13 @@ class RosterWindow:
else: else:
user1 = self.contacts[account][jid][0] user1 = self.contacts[account][jid][0]
if not 'not in the roster' in user1.groups: if not 'not in the roster' in user1.groups:
dialogs.InformationDialog(_('Subscription request has been sent'),
_('If "%s" accepts this request you will know his status.') %jid).get_response()
return return
user1.groups = [group] user1.groups = [group]
user1.name = pseudo user1.name = pseudo
self.remove_user(user1, account) self.remove_user(user1, account)
self.add_user_to_roster(jid, account) self.add_user_to_roster(jid, account)
if menuitem:
dialogs.InformationDialog(_('Subscription request has been sent'),
_('If "%s" accepts this request you will know his status.') %jid).get_response()
def on_roster_treeview_key_press_event(self, widget, event): def on_roster_treeview_key_press_event(self, widget, event):
'''when a key is pressed in the treeviews''' '''when a key is pressed in the treeviews'''