f-spot r4612 - in trunk: . src

[lmilesi svn gnome org]

Author: lmilesi
Date: Sun Nov 23 21:55:16 2008
New Revision: 4612
URL: http://svn.gnome.org/viewvc/f-spot?rev=4612&view=rev

Log:
2008-11-22  Lorenzo Milesi  <maxxer yetopen it>

        * src/MainWindow.cs: Don't steal DEL from TagType. fix bgo#560540.


Modified:
   trunk/ChangeLog
   trunk/src/MainWindow.cs

Modified: trunk/src/MainWindow.cs
==============================================================================
--- trunk/src/MainWindow.cs	(original)
+++ trunk/src/MainWindow.cs	Sun Nov 23 21:55:16 2008
@@ -2411,6 +2411,12 @@
 
 	public void HandleDeleteCommand (object sender, EventArgs args)
 	{
+		// Don't steal characters from any text entries
+		if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
+			Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
+			return;
+		}
+		
    		Photo[] photos = SelectedPhotos();
    		string header = Catalog.GetPluralString ("Delete the selected photo permanently?", 
 								    "Delete the {0} selected photos permanently?", 
@@ -2445,6 +2451,12 @@
 
 	public void HandleRemoveCommand (object sender, EventArgs args)
 	{
+		// Don't steal characters from any text entries
+		if (Window.Focus is Gtk.Entry && Gtk.Global.CurrentEvent is Gdk.EventKey) {
+			Window.Focus.ProcessEvent (Gtk.Global.CurrentEvent);
+			return;
+		}
+
    		Photo[] photos = SelectedPhotos();
 		if (photos.Length == 0) 
 			return;