Fix not to emit property-activate when state is not changed.

diff --git a/ui/gtk/menu.py b/ui/gtk/menu.py
index 7d69670..b9a6b44 100644 (file)
--- a/ui/gtk/menu.py
+++ b/ui/gtk/menu.py
@@ -157,11 +157,19 @@ class CheckMenuItem(gtk.CheckMenuItem, PropItem):
             self.hide_all()
 
     def do_toggled(self):
+        # Do not send property-activate to engine in case the event is
+        # sent from engine.
+        do_emit = False
         if self.get_active():
+            if self._prop.state != ibus.PROP_STATE_CHECKED:
+                do_emit = True
             self._prop.state = ibus.PROP_STATE_CHECKED
         else:
+            if self._prop.state != ibus.PROP_STATE_UNCHECKED:
+                do_emit = True
             self._prop.state = ibus.PROP_STATE_UNCHECKED
-        self.emit("property-activate", self._prop.key, self._prop.state)
+        if do_emit:
+            self.emit("property-activate", self._prop.key, self._prop.state)
 
     def property_changed(self):
         self.set_active(self._prop.state == ibus.PROP_STATE_CHECKED)
@@ -207,11 +215,19 @@ class RadioMenuItem(gtk.RadioMenuItem, PropItem):
             self.hide_all()
 
     def do_toggled(self):
+        # Do not send property-activate to engine in case the event is
+        # sent from engine.
+        do_emit = False
         if self.get_active():
+            if self._prop.state != ibus.PROP_STATE_CHECKED:
+                do_emit = True
             self._prop.state = ibus.PROP_STATE_CHECKED
         else:
+            if self._prop.state != ibus.PROP_STATE_UNCHECKED:
+                do_emit = True
             self._prop.state = ibus.PROP_STATE_UNCHECKED
-        self.emit("property-activate", self._prop.key, self._prop.state)
+        if do_emit:
+            self.emit("property-activate", self._prop.key, self._prop.state)
 
 class SeparatorMenuItem(gtk.SeparatorMenuItem, PropItem):
     __gtype_name__ = "IBusSeparatorMenuItem"

diff --git a/ui/gtk/toolitem.py b/ui/gtk/toolitem.py
index 071ab08..4bdffba 100644 (file)
--- a/ui/gtk/toolitem.py
+++ b/ui/gtk/toolitem.py
@@ -135,11 +135,19 @@ class ToggleToolButton(gtk.ToggleToolButton, PropItem):
             self.hide_all()
 
     def do_toggled(self):
+        # Do not send property-activate to engine in case the event is
+        # sent from engine.
+        do_emit = False
         if self.get_active():
+            if self._prop.state != ibus.PROP_STATE_CHECKED:
+                do_emit = True
             self._prop.state = ibus.PROP_STATE_CHECKED
         else:
+            if self._prop.state != ibus.PROP_STATE_UNCHECKED:
+                do_emit = True
             self._prop.state = ibus.PROP_STATE_UNCHECKED
-        self.emit("property-activate", self._prop.key, self._prop.state)
+        if do_emit:
+            self.emit("property-activate", self._prop.key, self._prop.state)
 
 class SeparatorToolItem(gtk.SeparatorToolItem, PropItem):
     __gtype_name__ = "IBusSeparatorToolItem"