[cheese/wip-cancel] ESC now takes you out of the effects selector

[Yuvaraj Pandian <yuvipanda src gnome org>]

commit b3d5a8b123b6f42d430b2ab75707661b037a0d32
Author: Yuvaraj Pandian T <yuvipanda gmail com>
Date:   Thu Aug 19 02:26:02 2010 +0530

    ESC now takes you out of the effects selector

 src/cheese-window.vala |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/src/cheese-window.vala b/src/cheese-window.vala
index 5b9fc0f..a1704a6 100644
--- a/src/cheese-window.vala
+++ b/src/cheese-window.vala
@@ -648,9 +648,9 @@ public class Cheese.MainWindow : Gtk.Window
     string key;
 
     key = Gdk.keyval_name (event.keyval);
-    if ((current_countdown != null && current_countdown.running) || is_bursting || is_recording)
+    if (strcmp (key, "Escape") == 0)
     {
-      if (strcmp (key, "Escape") == 0)
+      if ((current_countdown != null && current_countdown.running) || is_bursting || is_recording)
       {
         action_cancelled = true;
         if (current_mode == MediaMode.PHOTO)
@@ -672,6 +672,11 @@ public class Cheese.MainWindow : Gtk.Window
         }
         action_cancelled = false;
       }
+      else
+      if (is_effects_selector_active)
+      {
+        effects_toggle_action.set_active (false);
+      }
     }
     return false;
   }