summaryrefslogtreecommitdiff
path: root/setup
diff options
context:
space:
mode:
authorfujiwarat <takao.fujiwara1@gmail.com>2012-03-01 11:55:48 +0900
committerfujiwarat <takao.fujiwara1@gmail.com>2012-03-01 11:55:48 +0900
commit991166db3bbcaf8c76569a368dcaaf4dd7c263d8 (patch)
tree29bb171cd8dac7bd5cae5abd42497f47146b7925 /setup
parent25d05c609e0500dd2d51e946c672bc051a30972a (diff)
Fix no gconf engines_order and the engine setup button on ibus-setup.
TEST=Linux desktop Review URL: https://codereview.appspot.com/5702057
Diffstat (limited to 'setup')
-rw-r--r--setup/main.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/setup/main.py b/setup/main.py
index d1c7a1e5..f9c7e5eb 100644
--- a/setup/main.py
+++ b/setup/main.py
@@ -254,7 +254,7 @@ class Setup(object):
args = setup.split()
args.insert(1, path.basename(args[0]))
return args
- name = str(engine.name)
+ name = str(engine.get_name())
libexecdir = os.environ['IBUS_LIBEXECDIR']
setup_path = (libexecdir + '/' + 'ibus-setup-' if libexecdir != None \
else 'ibus-setup-') + name.split(':')[0]
@@ -275,11 +275,11 @@ class Setup(object):
self.__builder.get_object("button_engine_up").set_sensitive(engine not in engines[:1])
self.__builder.get_object("button_engine_down").set_sensitive(engine not in engines[-1:])
- # obj = self.__builder.get_object("button_engine_preferences")
- # if len(self.__get_engine_setup_exec_args(engine)) != 0:
- # obj.set_sensitive(True)
- # else:
- # obj.set_sensitive(False)
+ obj = self.__builder.get_object("button_engine_preferences")
+ if len(self.__get_engine_setup_exec_args(engine)) != 0:
+ obj.set_sensitive(True)
+ else:
+ obj.set_sensitive(False)
if prop.name == "engines":
engine_names = map(lambda e: e.get_name(), engines)
@@ -302,7 +302,7 @@ class Setup(object):
args = self.__get_engine_setup_exec_args(engine)
if len(args) == 0:
return
- name = engine.name
+ name = engine.get_name()
if name in self.__engine_setup_exec_list.keys():
try:
wpid, sts = os.waitpid(self.__engine_setup_exec_list[name],