Ubuntu

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

Proposed by Kieran Hogg on 2011-08-19
Status: Merged
Merged at revision: 64
Proposed branch: lp:~xerosis/ubuntu/oneiric/cheese/cheese-fix-for-817806
Merge into: lp:ubuntu/oneiric/cheese
Diff against target: 30 lines (+9/-2) 2 files modified
To merge this branch: bzr merge lp:~xerosis/ubuntu/oneiric/cheese/cheese-fix-for-817806
Reviewer Review Type Date Requested Status
Paolo Rotolo (community) Needs Fixing on 2011-09-09
Brian Murray Approve on 2011-09-08
Ubuntu branches 2011-08-19 Pending
Review via email: mp+72246@code.launchpad.net

Description of the Change

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

To post a comment you must log in.
Brian Murray (brian-murray) wrote :

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

review: Approve
Brian Murray (brian-murray) wrote :

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) wrote :

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

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-08-18 12:04:11 +0000
3+++ debian/changelog 2011-08-19 18:47:24 +0000
4@@ -1,3 +1,9 @@
5+cheese (3.0.1-2ubuntu3) oneiric; urgency=low
6+
7+ * Fix Cheese crashes when clicking the effects button (LP: #817806)
8+
9+ -- Kieran Hogg <kieran.hogg@gmail.com> Fri, 19 Aug 2011 19:19:28 +0100
10+
11 cheese (3.0.1-2ubuntu2) oneiric; urgency=low
12
13 * Depend on gstreamer0.10-plugins-good (>= 0.10.30-1ubuntu4)
14
15=== modified file 'src/cheese-window.vala'
16--- src/cheese-window.vala 2011-07-23 00:37:49 +0000
17+++ src/cheese-window.vala 2011-08-19 18:47:24 +0000
18@@ -839,9 +839,10 @@
19 burst_mode_action.sensitive = !action.active;
20 }
21
22- public bool on_selected_effect_change (Clutter.ButtonEvent event)
23+ public bool on_selected_effect_change (Clutter.Actor source,
24+ Clutter.ButtonEvent event)
25 {
26- selected_effect = event.source.get_data ("effect");
27+ selected_effect = source.get_data ("effect");
28 camera.set_effect (selected_effect);
29 settings.set_string ("selected-effect", selected_effect.name);
30 effects_toggle_action.set_active (false);

Subscribers

People subscribed via source and target branches

to all changes: