Merge lp:~unity-team/compiz/trunk.fix_759363 into lp:~unity-team/compiz/trunk

Proposed by Sam Spilsbury on 2011-04-15
Status: Merged
Merge reported by: David Barth
Merged at revision: not available
Proposed branch: lp:~unity-team/compiz/trunk.fix_759363
Merge into: lp:~unity-team/compiz/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
src/window.cpp (+1/-1)
To merge this branch: bzr merge lp:~unity-team/compiz/trunk.fix_759363
Reviewer Review Type Date Requested Status
David Barth (community) 2011-04-15 Approve on 2011-04-15
Review via email: mp+57890@code.launchpad.net

Description of the change

Fixes the crash where the application sets no or removes the _NET_STARTUP_ID (see http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt)

To post a comment you must log in.
David Barth (dbarth) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/window.cpp'
2--- src/window.cpp 2011-04-15 12:26:24 +0000
3+++ src/window.cpp 2011-04-15 15:21:33 +0000
4@@ -5068,7 +5068,7 @@
5
6 startupId = getStartupId ();
7
8- if (oldId)
9+ if (oldId && startupId)
10 {
11 if (strcmp (startupId, oldId) == 0)
12 newId = false;

Subscribers

People subscribed via source and target branches

to all changes: