Merge lp:~xerosis/ubuntu/oneiric/cheese/cheese-fix-for-817806 into lp:ubuntu/oneiric/cheese

[Kieran Hogg]

Fix for bug #817806 CHeese crashes when clicking the Effects button, patch taken from https://bugzilla.gnome.org/show_bug.cgi?id=647677

[Brian Murray (brian-murray)]

This looks good to me and I'm testing it now. Thanks for helping out!

review: Approve

[Brian Murray (brian-murray)]

Hrm I've run into some build failures with cheese:

/usr/bin/valac --thread --vapidir vapi --pkg config --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg gee-1.0 --pkg clutter-1.0 --pkg clutter-gtk-1.0 --pkg gstreamer-0.10 --pkg libcanberra-gtk --pkg libcanberra --pkg eogthumbnav --pkg cheese-thumbview --pkg cheese-common --pkg clutter-tablelayout -C cheese-main.vala cheese-window.vala cheese-countdown.vala cheese-effects-manager.vala cheese-preferences.vala thumbview/cheese-thumb-view.c thumbview/cheese-thumbnail.c thumbview/eog-thumb-nav.c
error: Package `config' not found in specified Vala API directories or GObject-Introspection GIR directories
error: Package `eogthumbnav' not found in specified Vala API directories or GObject-Introspection GIR directories
error: Package `cheese-thumbview' not found in specified Vala API directories or GObject-Introspection GIR directories
error: Package `cheese-common' not found in specified Vala API directories or GObject-Introspection GIR directories
error: Package `clutter-tablelayout' not found in specified Vala API directories or GObject-Introspection GIR directories

[Paolo Rotolo (paolorotolo)]

Hi,
I have tested this... All good in compilation, but this version don't resolve the bug...
Cheese crashes again when clicking the effects button...

Bye :)

review: Needs Fixing

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-18 12:04:11 +0000
+++ debian/changelog	2011-08-19 18:47:24 +0000
@@ -1,3 +1,9 @@
+cheese (3.0.1-2ubuntu3) oneiric; urgency=low
+
+  * Fix Cheese crashes when clicking the effects button (LP: #817806)
+
+ -- Kieran Hogg <[e-mail]>  Fri, 19 Aug 2011 19:19:28 +0100
+
 cheese (3.0.1-2ubuntu2) oneiric; urgency=low
 
   * Depend on gstreamer0.10-plugins-good (>= 0.10.30-1ubuntu4)

=== modified file 'src/cheese-window.vala'
--- src/cheese-window.vala	2011-07-23 00:37:49 +0000
+++ src/cheese-window.vala	2011-08-19 18:47:24 +0000
@@ -839,9 +839,10 @@
     burst_mode_action.sensitive = !action.active;
   }
 
-  public bool on_selected_effect_change (Clutter.ButtonEvent event)
+  public bool on_selected_effect_change (Clutter.Actor source,
+                                         Clutter.ButtonEvent event)
   {
-    selected_effect = event.source.get_data ("effect");
+    selected_effect = source.get_data ("effect");
     camera.set_effect (selected_effect);
     settings.set_string ("selected-effect", selected_effect.name);
     effects_toggle_action.set_active (false);