|
 |
fc8e58 |
From 3d03bd8f8c558392db42897370cef65bdbad57bd Mon Sep 17 00:00:00 2001
|
|
|
fc8e58 |
From: Mike FABIAN <mfabian@redhat.com>
|
|
|
fc8e58 |
Date: Tue, 5 Feb 2013 09:11:17 +0100
|
|
|
fc8e58 |
Subject: [PATCH 4/5] Fall back to auto_select = False if neither dconf nor
|
|
|
fc8e58 |
the table have a value for auto_select
|
|
|
fc8e58 |
|
|
|
fc8e58 |
---
|
|
|
fc8e58 |
engine/table.py | 11 ++++++++---
|
|
|
fc8e58 |
1 file changed, 8 insertions(+), 3 deletions(-)
|
|
|
fc8e58 |
|
|
|
fc8e58 |
diff --git a/engine/table.py b/engine/table.py
|
|
|
fc8e58 |
index f0a8a61..3999c35 100644
|
|
|
fc8e58 |
--- a/engine/table.py
|
|
|
fc8e58 |
+++ b/engine/table.py
|
|
|
fc8e58 |
@@ -233,8 +233,10 @@ class editor(object):
|
|
|
fc8e58 |
self._config_section,
|
|
|
fc8e58 |
"AutoSelect"))
|
|
|
fc8e58 |
if self._auto_select == None:
|
|
|
fc8e58 |
- self._auto_select = self.db.get_ime_property('auto_select').lower() == u'true'
|
|
|
fc8e58 |
-
|
|
|
fc8e58 |
+ if self.db.get_ime_property('auto_select') != None:
|
|
|
fc8e58 |
+ self._auto_select = self.db.get_ime_property('auto_select').lower() == u'true'
|
|
|
fc8e58 |
+ else:
|
|
|
fc8e58 |
+ self._auto_select = False
|
|
|
fc8e58 |
|
|
|
fc8e58 |
def init_select_keys(self):
|
|
|
fc8e58 |
# __select_keys: lookup table select keys/labels
|
|
|
fc8e58 |
@@ -1162,7 +1164,10 @@ class tabengine (IBus.Engine):
|
|
|
fc8e58 |
self._config_section,
|
|
|
fc8e58 |
"AutoSelect"))
|
|
|
fc8e58 |
if self._auto_select == None:
|
|
|
fc8e58 |
- self._auto_select = self.db.get_ime_property('auto_select').lower() == u'true'
|
|
|
fc8e58 |
+ if self.db.get_ime_property('auto_select') != None:
|
|
|
fc8e58 |
+ self._auto_select = self.db.get_ime_property('auto_select').lower() == u'true'
|
|
|
fc8e58 |
+ else:
|
|
|
fc8e58 |
+ self._auto_select = False
|
|
|
fc8e58 |
|
|
|
fc8e58 |
# the commit phrases length
|
|
|
fc8e58 |
self._len_list = [0]
|
|
|
fc8e58 |
--
|
|
|
fc8e58 |
1.7.11.7
|
|
|
fc8e58 |
|