meld r1092 - trunk

[kaiw svn gnome org]

Author: kaiw
Date: Wed Dec  3 18:46:02 2008
New Revision: 1092
URL: http://svn.gnome.org/viewvc/meld?rev=1092&view=rev

Log:
Bug 349247, 510589 â Fix cut, copy and paste shortcuts being discarded.

Modified:
   trunk/meldapp.py
   trunk/melddoc.py

Modified: trunk/meldapp.py
==============================================================================
--- trunk/meldapp.py	(original)
+++ trunk/meldapp.py	Wed Dec  3 18:46:02 2008
@@ -741,13 +741,25 @@
         self.current_doc().on_replace_activate()
 
     def on_menu_copy_activate(self, *extra):
-        self.current_doc().on_copy_activate()
+        widget = self.widget.get_focus()
+        if isinstance(widget, gtk.Editable):
+            widget.copy_clipboard()
+        elif isinstance(widget, gtk.TextView):
+            widget.emit("copy-clipboard")
 
     def on_menu_cut_activate(self, *extra):
-        self.current_doc().on_cut_activate()
+        widget = self.widget.get_focus()
+        if isinstance(widget, gtk.Editable):
+            widget.cut_clipboard()
+        elif isinstance(widget, gtk.TextView):
+            widget.emit("cut-clipboard")
 
     def on_menu_paste_activate(self, *extra):
-        self.current_doc().on_paste_activate()
+        widget = self.widget.get_focus()
+        if isinstance(widget, gtk.Editable):
+            widget.paste_clipboard()
+        elif isinstance(widget, gtk.TextView):
+            widget.emit("paste-clipboard")
 
     #
     # Toolbar and menu items (settings)

Modified: trunk/melddoc.py
==============================================================================
--- trunk/melddoc.py	(original)
+++ trunk/melddoc.py	Wed Dec  3 18:46:02 2008
@@ -100,13 +100,6 @@
     def on_replace_activate(self, *extra):
         pass
 
-    def on_copy_activate(self, *args):
-        pass
-    def on_cut_activate(self, *args):
-        pass
-    def on_paste_activate(self, *args):
-        pass
-
     def on_preference_changed(self, key, value):
         pass