changeset 78bb694fa308 in /home/hg/repos/gajim
author: Yann Leboulanger asterix@lagaule.org branches: details:http://hg.gajim.org/gajim?cmd=changeset;node=78bb694fa308 description: specify module version before importing
diffstat:
src/chat_control.py | 1 + src/gtkgui_helpers.py | 3 ++- src/gtkspell.py | 1 + src/gui_interface.py | 19 ++++++++++--------- 4 files changed, 14 insertions(+), 10 deletions(-)
diffs (68 lines):
diff -r 7ac4d602d73e -r 78bb694fa308 src/chat_control.py --- a/src/chat_control.py Sun Aug 30 23:22:42 2015 +0200 +++ b/src/chat_control.py Sun Aug 30 23:23:10 2015 +0200 @@ -29,6 +29,7 @@
import os import time +gi.require_version('GdkX11', '3.0') from gi.repository import GdkX11 from gi.repository import Gtk from gi.repository import Gdk diff -r 7ac4d602d73e -r 78bb694fa308 src/gtkgui_helpers.py --- a/src/gtkgui_helpers.py Sun Aug 30 23:22:42 2015 +0200 +++ b/src/gtkgui_helpers.py Sun Aug 30 23:23:10 2015 +0200 @@ -177,11 +177,12 @@ Xfce and last KDE it returns None on failure or else a string 'Font Size' """ try: + gi.require_version('GConf', '2.0') from gi.repository import GConf client = GConf.Client.get_default() value = client.get_string("/desktop/gnome/interface/font_name") return value.decode("utf8") - except ImportError: + except ValueError: pass
# try to get Xfce default font diff -r 7ac4d602d73e -r 78bb694fa308 src/gtkspell.py --- a/src/gtkspell.py Sun Aug 30 23:22:42 2015 +0200 +++ b/src/gtkspell.py Sun Aug 30 23:23:10 2015 +0200 @@ -18,6 +18,7 @@ ## along with Gajim. If not, see http://www.gnu.org/licenses/.
from gi.repository import Gtk +gi.require_version('GtkSpell', '3.0') from gi.repository import GtkSpell
def ensure_attached(func): diff -r 7ac4d602d73e -r 78bb694fa308 src/gui_interface.py --- a/src/gui_interface.py Sun Aug 30 23:22:42 2015 +0200 +++ b/src/gui_interface.py Sun Aug 30 23:23:10 2015 +0200 @@ -2779,15 +2779,16 @@ gajim.ZEROCONF_ACC_NAME = account break # Is gnome configured to activate row on single click ? - try: - from gi.repository import GConf - client = GConf.Client.get_default() - click_policy = client.get_string( - '/apps/nautilus/preferences/click_policy') - if click_policy == 'single': - gajim.single_click = True - except Exception: - pass +# try: +# gi.require_version('GConf', '2.0') +# from gi.repository import GConf +# client = GConf.Client.get_default() +# click_policy = client.get_string( +# '/apps/nautilus/preferences/click_policy') +# if click_policy == 'single': +# gajim.single_click = True +# except Exception: +# pass # add default status messages if there is not in the config file if len(gajim.config.get_per('statusmsg')) == 0: default = gajim.config.statusmsg_default
-
Gajim