Merge lp://qastaging/~didrocks/unity/fix-710876-711105 into lp://qastaging/unity

Proposed by Didier Roche-Tolomelli on 2011-02-07

Status:

Merged

Approved by:

Gord Allott on 2011-02-07

Approved revision:

no longer in the source branch.

Merged at revision:

826

Proposed branch:

Merge into:

Diff against target:

1 file modified

tools/unity.cmake (+10/-1)

To merge this branch:

bzr merge lp://qastaging/~didrocks/unity/fix-710876-711105

Related bugs:

Bug #710876: unity crashed with GError in reset_unity_compiz_profile(): Failed to contact configuration server; the most common cause is a missing or misconfigured D-Bus session bus daemon. See http://projects.gnome.org/gconf/ for information. (Details - 1: Failed to get connection to session: Command line `dbus-launch --autolaunch=650ed7c59cfab2af2b70546000000012 --binary-syntax --close-stderr' exited with non-zero exit status 1: No protocol specified\nAutolaunch error: X11 initialization failed.\n)	Medium	Fix Released
Bug #711105: unity crashed with AttributeError in reset_unity_compiz_profile(): 'NoneType' object has no attribute 'get_default_value'	Medium	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Unity Team		2011-02-07	Pending
Review via email: mp+48757@code.qastaging.launchpad.net

fix crash if no current profile in compiz and we try to reset unity (LP:
#711105)
fix crash if --reset without a gconf client available (LP: #710876)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff is not available at this time. You can reload the page or download it.