From 8da03ee1d134b0dbc6f48f07cd89c03be4d12751 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sun, 2 May 2010 11:59:13 +0200
Subject: [PATCH] fix zeroconf name conflict answer.

---
 src/gui_interface.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gui_interface.py b/src/gui_interface.py
index 1214048ba3..388bf14b1d 100644
--- a/src/gui_interface.py
+++ b/src/gui_interface.py
@@ -1672,9 +1672,10 @@ class Interface:
     def handle_event_zc_name_conflict(self, account, data):
         def on_ok(new_name):
             gajim.config.set_per('accounts', account, 'name', new_name)
+            show = gajim.connections[account].old_show
             status = gajim.connections[account].status
             gajim.connections[account].username = new_name
-            gajim.connections[account].change_status(status, '')
+            gajim.connections[account].change_status(show, status)
         def on_cancel():
             gajim.connections[account].change_status('offline', '')
 
-- 
GitLab