fix a few things for gtk3
This commit is contained in:
parent
dce1c2d03f
commit
7046cd0608
5 changed files with 6 additions and 6 deletions
|
@ -42,7 +42,7 @@ from calendar import timegm
|
||||||
import nbxmpp
|
import nbxmpp
|
||||||
from common import caps_cache as capscache
|
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 helpers
|
||||||
from common import gajim
|
from common import gajim
|
||||||
from common import exceptions
|
from common import exceptions
|
||||||
|
|
|
@ -28,7 +28,7 @@ from common import defs
|
||||||
import unicodedata
|
import unicodedata
|
||||||
|
|
||||||
# May be changed after GTK is imported
|
# May be changed after GTK is imported
|
||||||
direction_mark = u'\u200F'
|
direction_mark = '\u200F'
|
||||||
|
|
||||||
def paragraph_direction_mark(text):
|
def paragraph_direction_mark(text):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -166,7 +166,7 @@ class ProxyResolver:
|
||||||
self.state = S_FINISHED
|
self.state = S_FINISHED
|
||||||
|
|
||||||
def _on_connect_failure(self):
|
def _on_connect_failure(self):
|
||||||
print 'connection failed: ' + self.host
|
print('connection failed: ' + self.host)
|
||||||
self.state = S_FINISHED
|
self.state = S_FINISHED
|
||||||
self.host = None
|
self.host = None
|
||||||
self.port = 0
|
self.port = 0
|
||||||
|
|
|
@ -210,7 +210,7 @@ if os.name == 'nt':
|
||||||
warnings.filterwarnings(action='ignore')
|
warnings.filterwarnings(action='ignore')
|
||||||
|
|
||||||
if Gtk.Widget.get_default_direction() == Gtk.TextDirection.LTR:
|
if Gtk.Widget.get_default_direction() == Gtk.TextDirection.LTR:
|
||||||
i18n.direction_mark = u'\u200E'
|
i18n.direction_mark = '\u200E'
|
||||||
pritext = ''
|
pritext = ''
|
||||||
|
|
||||||
from common import exceptions
|
from common import exceptions
|
||||||
|
|
|
@ -2808,8 +2808,8 @@ class GroupchatControl(ChatControlBase):
|
||||||
if fjid in connection.blocked_contacts:
|
if fjid in connection.blocked_contacts:
|
||||||
return
|
return
|
||||||
max_order = connection.get_max_blocked_list_order()
|
max_order = connection.get_max_blocked_list_order()
|
||||||
new_rule = {'order': str(max_order + 1), 'type': u'jid',
|
new_rule = {'order': str(max_order + 1), 'type': 'jid',
|
||||||
'action': u'deny', 'value' : fjid, 'child': ['message', 'iq',
|
'action': 'deny', 'value' : fjid, 'child': ['message', 'iq',
|
||||||
'presence-out']}
|
'presence-out']}
|
||||||
connection.blocked_list.append(new_rule)
|
connection.blocked_list.append(new_rule)
|
||||||
connection.blocked_contacts.append(fjid)
|
connection.blocked_contacts.append(fjid)
|
||||||
|
|
Loading…
Add table
Reference in a new issue