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

correctly update parent when we drop child on another contact

This commit is contained in:
Yann Leboulanger 2006-03-24 13:31:21 +00:00
parent f8db75e255
commit 6724001ee3
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/roster_window.py
View File

@ -2832,7 +2832,6 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
def on_drop_in_contact(self, widget, account, c_source, c_dest, context, def on_drop_in_contact(self, widget, account, c_source, c_dest, context,
etime): etime):
# remove the source row # remove the source row
model = self.tree.get_model()
self.remove_contact(c_source, account) self.remove_contact(c_source, account)
# brother inherite big brother groups # brother inherite big brother groups
c_source.groups = [] c_source.groups = []
@ -2956,14 +2955,13 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
if jid_source == jid_dest: if jid_source == jid_dest:
if grp_source == grp_dest: if grp_source == grp_dest:
return return
else: if context.action == gtk.gdk.ACTION_COPY:
if context.action == gtk.gdk.ACTION_COPY:
self.on_drop_in_group(None, account, c_source, grp_dest, context,
etime)
return
self.on_drop_in_group(None, account, c_source, grp_dest, context, self.on_drop_in_group(None, account, c_source, grp_dest, context,
etime, grp_source) etime)
return return
self.on_drop_in_group(None, account, c_source, grp_dest, context,
etime, grp_source)
return
if grp_source == grp_dest: if grp_source == grp_dest:
# Add meta contact # Add meta contact
#FIXME: doesn't work under windows: http://bugzilla.gnome.org/show_bug.cgi?id=329797 #FIXME: doesn't work under windows: http://bugzilla.gnome.org/show_bug.cgi?id=329797
@ -2972,16 +2970,8 @@ _('If "%s" accepts this request you will know his or her status.') % jid)
# return # return
c_dest = gajim.contacts.get_contact_with_highest_priority(account, c_dest = gajim.contacts.get_contact_with_highest_priority(account,
jid_dest) jid_dest)
# brother inherite big brother groups self.on_drop_in_contact(treeview, account, c_source, c_dest, context,
c_source.groups = [] etime)
for g in c_dest.groups:
c_source.groups.append(g)
gajim.contacts.add_metacontact(account, jid_dest, account, jid_source)
# remove the source row
context.finish(True, True, etime)
# Add it under parent contact
self.add_contact_to_roster(jid_source, account)
self.draw_contact(jid_dest, account)
return return
# We upgrade only the first user because user2.groups is a pointer to # We upgrade only the first user because user2.groups is a pointer to
# user1.groups # user1.groups