Revert "when removing last metacontact little brother, remove meta tag for big brother" from [9553],
that breaks meta over multiple accounts. Thanks steve-e
This commit is contained in:
		
							parent
							
								
									7144520bc0
								
							
						
					
					
						commit
						cb9d2a3ca0
					
				
					 1 changed files with 1 additions and 5 deletions
				
			
		| 
						 | 
					@ -810,6 +810,7 @@ class RosterWindow:
 | 
				
			||||||
		if jid in gajim.newly_added[account]:
 | 
							if jid in gajim.newly_added[account]:
 | 
				
			||||||
			gajim.newly_added[account].remove(jid)
 | 
								gajim.newly_added[account].remove(jid)
 | 
				
			||||||
			self.draw_contact(jid, account)
 | 
								self.draw_contact(jid, account)
 | 
				
			||||||
 | 
								# redraw group visibility
 | 
				
			||||||
			self.refilter_shown_roster_items()
 | 
								self.refilter_shown_roster_items()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	# FIXME: maybe move to gajim.py
 | 
						# FIXME: maybe move to gajim.py
 | 
				
			||||||
| 
						 | 
					@ -3706,11 +3707,6 @@ class RosterWindow:
 | 
				
			||||||
					if data['jid'] == c_source.jid and\
 | 
										if data['jid'] == c_source.jid and\
 | 
				
			||||||
					data['account'] == account:
 | 
										data['account'] == account:
 | 
				
			||||||
						continue
 | 
											continue
 | 
				
			||||||
					if len(family) == 2:
 | 
					 | 
				
			||||||
						# we deleted last remaining little brother, remove the meta 
 | 
					 | 
				
			||||||
						# tag for the parent
 | 
					 | 
				
			||||||
						gajim.contacts.remove_metacontact(data['account'], \
 | 
					 | 
				
			||||||
							data['jid'])
 | 
					 | 
				
			||||||
					self.add_contact(data['jid'], data['account'])
 | 
										self.add_contact(data['jid'], data['account'])
 | 
				
			||||||
					break
 | 
										break
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		
		Reference in a new issue