changeset 0d750b6ca15a in /home/hg/repos/gajim
branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=0d750b6ca15a description: fix a few things for gtk3
diffstat:
src/common/connection_handlers.py | 2 +- src/common/i18n.py | 2 +- src/common/proxy65_manager.py | 2 +- src/gajim.py | 2 +- src/groupchat_control.py | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-)
diffs (62 lines):
diff -r 4344e00225ac -r 0d750b6ca15a src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/common/connection_handlers.py Sun Jul 28 19:38:49 2013 +0200 @@ -42,7 +42,7 @@ import nbxmpp from common import caps_cache as capscache
-from pep import LOCATION_DATA +from common.pep import LOCATION_DATA from common import helpers from common import gajim from common import exceptions diff -r 4344e00225ac -r 0d750b6ca15a src/common/i18n.py --- a/src/common/i18n.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/common/i18n.py Sun Jul 28 19:38:49 2013 +0200 @@ -28,7 +28,7 @@ import unicodedata
# May be changed after GTK is imported -direction_mark = u'\u200F' +direction_mark = '\u200F'
def paragraph_direction_mark(text): """ diff -r 4344e00225ac -r 0d750b6ca15a src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/common/proxy65_manager.py Sun Jul 28 19:38:49 2013 +0200 @@ -166,7 +166,7 @@ self.state = S_FINISHED
def _on_connect_failure(self): - print 'connection failed: ' + self.host + print('connection failed: ' + self.host) self.state = S_FINISHED self.host = None self.port = 0 diff -r 4344e00225ac -r 0d750b6ca15a src/gajim.py --- a/src/gajim.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/gajim.py Sun Jul 28 19:38:49 2013 +0200 @@ -210,7 +210,7 @@ warnings.filterwarnings(action='ignore')
if Gtk.Widget.get_default_direction() == Gtk.TextDirection.LTR: - i18n.direction_mark = u'\u200E' + i18n.direction_mark = '\u200E' pritext = ''
from common import exceptions diff -r 4344e00225ac -r 0d750b6ca15a src/groupchat_control.py --- a/src/groupchat_control.py Sun Jul 28 08:53:06 2013 +0200 +++ b/src/groupchat_control.py Sun Jul 28 19:38:49 2013 +0200 @@ -2808,8 +2808,8 @@ if fjid in connection.blocked_contacts: return max_order = connection.get_max_blocked_list_order() - new_rule = {'order': str(max_order + 1), 'type': u'jid', - 'action': u'deny', 'value' : fjid, 'child': ['message', 'iq', + new_rule = {'order': str(max_order + 1), 'type': 'jid', + 'action': 'deny', 'value' : fjid, 'child': ['message', 'iq', 'presence-out']} connection.blocked_list.append(new_rule) connection.blocked_contacts.append(fjid)