Move modifier masks from keysyms to modifier.

Remove debug output.

diff --git a/engine/enchant/engine.py b/engine/enchant/engine.py
index c14ce8c..8508ac9 100644 (file)
--- a/engine/enchant/engine.py
+++ b/engine/enchant/engine.py
@@ -6,6 +6,7 @@ import dbus
 import ibus
 import enchant
 from ibus import keysyms
+from ibus import modifier
 from ibus import interface
 
 class Engine (interface.IEngine):
@@ -68,7 +69,7 @@ class Engine (interface.IEngine):
                                return True
                if keyval in xrange (keysyms.a, keysyms.z + 1) or \
                        keyval in xrange (keysyms.A, keysyms.Z + 1):
-                       if state & (keysyms.CONTROL_MASK | keysyms.ALT_MASK) == 0:
+                       if state & (modifier.CONTROL_MASK | modifier.ALT_MASK) == 0:
                                self._preedit_string += unichr (keyval)
                                self._invalidate ()
                                return True

diff --git a/ibusdaemon/bus.py b/ibusdaemon/bus.py
index 76bc4f8..d9567ad 100644 (file)
--- a/ibusdaemon/bus.py
+++ b/ibusdaemon/bus.py
@@ -3,6 +3,7 @@ import weakref
 import dbus
 import ibus
 from ibus import keysyms
+from ibus import modifier
 from contextmanager import ContextManager
 from factorymanager import FactoryManager
 from connection import Connection
@@ -117,7 +118,7 @@ class IBus (ibus.Object):
 
        def _filter_hotkeys (self, context, keyval, is_press, state):
                if is_press and keyval == keysyms.space \
-                       and (state & ~keysyms.MOD2_MASK) == keysyms.CONTROL_MASK:
+                       and (state & ~modifier.MOD2_MASK) == modifier.CONTROL_MASK:
                        enable = not context.is_enabled ()
                        context.set_enable (enable)
                        if context.get_engine () == None and enable:

diff --git a/ibusdaemon/ibusdaemon.py b/ibusdaemon/ibusdaemon.py
index 15d2229..d2ecdd8 100644 (file)
--- a/ibusdaemon/ibusdaemon.py
+++ b/ibusdaemon/ibusdaemon.py
@@ -27,8 +27,6 @@ class DBus (dbus.service.Object):
 
        @method (in_signature = "s", out_signature = "s")
        def GetNameOwner (self, name):
-               print "GetNameOwner (%s)" % name
-
                if name == dbus.BUS_DAEMON_NAME:
                        return dbus.BUS_DAEMON_NAME
                elif name == ibus.IBUS_NAME:
@@ -39,7 +37,6 @@ class DBus (dbus.service.Object):
 
        @method (in_signature = "s")
        def AddMatch (self, rule):
-               print "AddMatch"
                pass
 
        @signal (signature = "sss")
@@ -71,8 +68,6 @@ class IBusServer (dbus.server.Server):
                        if self._ibus.dispatch_dbus_signal (dbusconn, message):
                                return dbus.lowlevel.HANDLER_RESULT_HANDLED
 
-               self._print_message (message)
-
                return dbus.lowlevel.HANDLER_RESULT_NOT_YET_HANDLED
 
        def _print_message (self, message):