From 635b05c1ca1726cd228ff2f9803a89867c1afc8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=B6rist?= Date: Sun, 2 Jul 2017 19:42:42 +0200 Subject: [PATCH] Make noto-emoticons the default theme --- gajim/common/config.py | 2 +- gajim/common/defs.py | 2 +- gajim/common/optparser.py | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gajim/common/config.py b/gajim/common/config.py index fe254558d..c520e1194 100644 --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -123,7 +123,7 @@ class Config: 'speller_language': [ opt_str, '', _('Language used by speller')], 'print_time': [ opt_str, 'always', _('\'always\' - print time for every message.\n\'sometimes\' - print time every print_ichat_every_foo_minutes minute.\n\'never\' - never print time.')], 'print_time_fuzzy': [ opt_int, 0, _('Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. This is used only if print_time is \'sometimes\'.') ], - 'emoticons_theme': [opt_str, 'static', '', True ], + 'emoticons_theme': [opt_str, 'noto-emoticons', '', True ], 'ascii_formatting': [ opt_bool, True, _('Treat * / _ pairs as possible formatting characters.'), True], 'show_ascii_formatting_chars': [ opt_bool, True, _('If True, do not ' diff --git a/gajim/common/defs.py b/gajim/common/defs.py index c5212348b..e95fc21f9 100644 --- a/gajim/common/defs.py +++ b/gajim/common/defs.py @@ -30,7 +30,7 @@ import os.path docdir = '../' basedir = '../' localedir = '../po' -version = '0.16.10.3' +version = '0.16.10.4' try: node = subprocess.Popen('git rev-parse --short=12 HEAD', shell=True, diff --git a/gajim/common/optparser.py b/gajim/common/optparser.py index bdd550cfa..34960d508 100644 --- a/gajim/common/optparser.py +++ b/gajim/common/optparser.py @@ -236,6 +236,8 @@ class OptionsParser: self.update_config_to_016102() if old < [0, 16, 10, 3] and new >= [0, 16, 10, 3]: self.update_config_to_016103() + if old < [0, 16, 10, 4] and new >= [0, 16, 10, 4]: + self.update_config_to_016104() gajim.logger.init_vars() gajim.logger.attach_cache_database() @@ -999,3 +1001,7 @@ class OptionsParser: pass con.close() gajim.config.set('version', '0.16.10.3') + + def update_config_to_016104(self): + gajim.config.set('emoticons_theme', 'noto-emoticons') + gajim.config.set('version', '0.16.10.4')