[POS-commit] r3350 - in kiwi/trunk: .

[Johan Dahlin]

Author: jdahlin
Date: Thu Apr 27 10:17:30 2006
New Revision: 3350

Modified:
   kiwi/trunk/ChangeLog
   kiwi/trunk/kiwi/ui/widgets/entry.py

Log:
    * kiwi/ui/widgets/entry.py (ProxyEntry.do_changed): Merge the
    the do_changed methods.



Modified: kiwi/trunk/ChangeLog
==============================================================================
--- kiwi/trunk/ChangeLog	(original)
+++ kiwi/trunk/ChangeLog	Thu Apr 27 10:17:30 2006
@@ -1,5 +1,8 @@
 2006-04-27  Johan Dahlin  <jdahlin at async.com.br>
 
+	* kiwi/ui/widgets/entry.py (ProxyEntry.do_changed): Merge the
+	the do_changed methods.
+
 	* kiwi/environ.py (Environment.find_resource): Make sure it's a file
 
 2006-04-26  Ronaldo Maia  <romaia at async.com.br>

Modified: kiwi/trunk/kiwi/ui/widgets/entry.py
==============================================================================
--- kiwi/trunk/kiwi/ui/widgets/entry.py	(original)
+++ kiwi/trunk/kiwi/ui/widgets/entry.py	Thu Apr 27 10:17:30 2006
@@ -78,14 +78,9 @@
     # Virtual methods
     gsignal('changed', 'override')
     def do_changed(self):
-        """Called when the content of the entry changes.
-
-        Sets an internal variable that stores the last time the user
-        changed the entry
-        """
-
-        self.chain()
-
+        if self._block_changed:
+            self.emit_stop_by_name('changed')
+            return
         self._update_current_object(self.get_text())
         self.emit('content-changed')
 
@@ -174,12 +169,6 @@
 
         self.set_position(-1)
 
-    def do_changed(self):
-        if self._block_changed:
-            self.emit_stop_by_name('changed')
-            return
-        self.emit('content-changed')
-
     # ProxyWidgetMixin implementation
 
     def read(self):