Merge lp:~compiz-team/compiz-core/compiz-core.fix_857487 into lp:compiz-core/0.9.5

Proposed by Sam Spilsbury
Status: Merged
Approved by: Gord Allott
Approved revision: 2855
Merged at revision: 2856
Proposed branch: lp:~compiz-team/compiz-core/compiz-core.fix_857487
Merge into: lp:compiz-core/0.9.5
Diff against target: 23 lines (+3/-3)
1 file modified
src/screen.cpp (+3/-3)
To merge this branch: bzr merge lp:~compiz-team/compiz-core/compiz-core.fix_857487
Reviewer Review Type Date Requested Status
Compiz Maintainers Pending
Review via email: mp+78066@code.launchpad.net

Description of the change

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/screen.cpp'
--- src/screen.cpp 2011-09-30 04:54:21 +0000
+++ src/screen.cpp 2011-10-04 09:28:17 +0000
@@ -2615,7 +2615,7 @@
2615 if (it == priv->windows.end ())2615 if (it == priv->windows.end ())
2616 {2616 {
2617 compLogMessage ("core", CompLogLevelDebug, "could not insert 0x%x above 0x%x",2617 compLogMessage ("core", CompLogLevelDebug, "could not insert 0x%x above 0x%x",
2618 (unsigned int) (*it)->priv->serverId, aboveId);2618 (unsigned int) w->priv->serverId, aboveId);
2619#ifdef DEBUG2619#ifdef DEBUG
2620 abort ();2620 abort ();
2621#endif2621#endif
@@ -2673,8 +2673,8 @@
26732673
2674 if (it == priv->serverWindows.end ())2674 if (it == priv->serverWindows.end ())
2675 {2675 {
2676 compLogMessage ("core", CompLogLevelDebug, "could not insert 0x%x above 0x%x",2676 compLogMessage ("core", CompLogLevelWarn, "could not insert 0x%x above 0x%x",
2677 (unsigned int) (*it)->priv->serverId, aboveId);2677 (unsigned int) w->priv->serverId, aboveId);
2678#ifdef DEBUG2678#ifdef DEBUG
2679 abort ();2679 abort ();
2680#endif2680#endif

Subscribers

People subscribed via source and target branches