diff --git a/src/common/connection.py b/src/common/connection.py index ab5864d0b0607abe125436c6821c3571330b2c62..d8bf6d3e3878248c309145a3f96e83b86e194d67 100644 --- a/src/common/connection.py +++ b/src/common/connection.py @@ -22,11 +22,11 @@ import os import time import sre import traceback -import helpers from calendar import timegm import common.xmpp +from common import helpers from common import gajim from common import GnuPG USE_GPG = GnuPG.USE_GPG diff --git a/src/roster_window.py b/src/roster_window.py index c6ca916a5435ceebe825d9d1122543ecf9b5c6f4..b3ac30853527b7d29b2b12c2f6ed1ddd316d3101 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -801,11 +801,12 @@ class Roster_window: else: self.plugin.sleeper_state[account] = 0 - def get_status_message(self, status): - if (status == 'online' and not gajim.config.get('ask_online_status')) or \ - (status == 'offline' and not gajim.config.get('ask_offline_status')): - return status - dlg = dialogs.Change_status_message_dialog(self.plugin, status) + def get_status_message(self, show): + if (show == 'online' and not gajim.config.get('ask_online_status')) or \ + (show == 'offline' and not gajim.config.get('ask_offline_status')): + lowered_uf_status_msg = helpers.get_uf_show(show).lower() + return "I'm %s" % lowered_uf_status_msg + dlg = dialogs.Change_status_message_dialog(self.plugin, show) message = dlg.run() return message