diff --git a/gajim/app_actions.py b/gajim/app_actions.py
index b25a87007..d32989993 100644
--- a/gajim/app_actions.py
+++ b/gajim/app_actions.py
@@ -80,6 +80,12 @@ class AppActions():
def on_quit(self, action, param):
interface.roster.on_quit_request()
+ def on_new_chat(self, action, param):
+ if 'start_chat' in app.interface.instances:
+ app.interface.instances['start_chat'].present()
+ else:
+ app.interface.instances['start_chat'] = dialogs.StartChatDialog()
+
# Accounts Actions
def on_profile(self, action, param):
@@ -130,9 +136,6 @@ class AppActions():
def on_add_contact(self, action, param):
dialogs.AddNewContactWindow(param.get_string())
- def on_new_chat(self, action, param):
- dialogs.NewChatDialog(param.get_string())
-
def on_single_message(self, action, param):
dialogs.SingleMessageWindow(param.get_string(), action='send')
diff --git a/gajim/common/helpers.py b/gajim/common/helpers.py
index 06142f5fd..51eca6afa 100644
--- a/gajim/common/helpers.py
+++ b/gajim/common/helpers.py
@@ -411,6 +411,16 @@ def get_uf_show(show, use_mnemonic = False):
uf_show = Q_('?contact has status:Has errors')
return uf_show
+def get_css_show_color(show):
+ if show in ('online', 'chat', 'invisible'):
+ return 'status-online'
+ elif show in ('offline', 'not in roster', 'requested'):
+ return None
+ elif show in ('xa', 'dnd'):
+ return 'status-dnd'
+ elif show in ('away'):
+ return 'status-away'
+
def get_uf_sub(sub):
if sub == 'none':
uf_sub = Q_('?Subscription we already have:None')
diff --git a/gajim/data/gui/account_context_menu.ui b/gajim/data/gui/account_context_menu.ui
index 665f54d80..333804447 100644
--- a/gajim/data/gui/account_context_menu.ui
+++ b/gajim/data/gui/account_context_menu.ui
@@ -28,15 +28,6 @@
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
-
-
-