diff -u cheese-2.22.1/debian/changelog cheese-2.22.1/debian/changelog
--- cheese-2.22.1/debian/changelog
+++ cheese-2.22.1/debian/changelog
@@ -1,3 +1,10 @@
+cheese (2.22.1-0ubuntu2) hardy; urgency=low
+
+  * Update 40_hildon.patch to not crash in Hildon when About or Quit
+    are activated (LP: #207437)
+
+ -- Michael Terry <michael.terry@ubuntu.com>  Fri, 30 May 2008 13:34:38 -0400
+
 cheese (2.22.1-0ubuntu1) hardy; urgency=low
 
   [ Gary Lasker ]
diff -u cheese-2.22.1/debian/patches/40_hildon.patch cheese-2.22.1/debian/patches/40_hildon.patch
--- cheese-2.22.1/debian/patches/40_hildon.patch
+++ cheese-2.22.1/debian/patches/40_hildon.patch
@@ -100,15 +100,15 @@
 +#ifdef HILDON
 +  menu = gtk_menu_new();
 +  menuitem = gtk_menu_item_new_with_label(_("Quit"));
-+  g_signal_connect_swapped(menuitem,"activate",
-+			   GTK_SIGNAL_FUNC(cheese_window_cmd_close),
-+			   NULL);
++  g_signal_connect(menuitem,"activate",
++                   GTK_SIGNAL_FUNC(cheese_window_cmd_close),
++                   cheese_window);
 +  gtk_menu_append(menu, menuitem);
 +  
 +  menuitem = gtk_menu_item_new_with_label(_("About"));
-+  g_signal_connect_swapped(menuitem,"activate",
-+			   GTK_SIGNAL_FUNC(cheese_window_cmd_about), 
-+			   cheese_window->window);
++  g_signal_connect(menuitem,"activate",
++                   GTK_SIGNAL_FUNC(cheese_window_cmd_about), 
++                   cheese_window);
 +  gtk_menu_append(menu, menuitem);
 +  
 +  hildon_window_set_menu (HILDON_WINDOW(cheese_window->window),GTK_MENU(menu));