CompWindow::syncPosition () is deprecated and calls to

it need to be removed from lp:unity (see lp:compiz, r3639) UnityDialogWindow::moveToRect(CompRect currentRect) does not need the bool sync anymore (bzr r3255.1.1)

2 files changed, 5 insertions, 12 deletions

diff --git a/plugins/unitydialog/src/unitydialog.cpp b/plugins/unitydialog/src/unitydialog.cpp
index 138fd02f9..abc86b76e 100644
--- a/plugins/unitydialog/src/unitydialog.cpp
+++ b/plugins/unitydialog/src/unitydialog.cpp
@@ -72,7 +72,7 @@ UnityDialogScreen::matchExpHandlerChanged()
 }
 
 void
-UnityDialogWindow::moveToRect(CompRect currentRect, bool sync)
+UnityDialogWindow::moveToRect(CompRect currentRect)
 {
 CompPoint pos = getChildCenteredPositionForRect(currentRect);
 
@@ -80,9 +80,6 @@ UnityDialogWindow::moveToRect(CompRect currentRect, bool sync)
 window->move(pos.x() - window->borderRect().x(),
 pos.y() - window->borderRect().y(), true);
 
- if (sync)
- window->syncPosition();
-
 setMaxConstrainingAreas();
 mSkipNotify = false;
 }
@@ -826,7 +823,6 @@ UnityDialogWindow::removeTransient(CompWindow* w)
 
 cWindow->addDamage();
 window->move(-mOffset.x() - mDiffXWC.x, -mOffset.y() - mDiffXWC.y, true);
- window->syncPosition();
 cWindow->addDamage();
 
 memset(&mDiffXWC, 0, sizeof(XWindowChanges));
@@ -903,7 +899,7 @@ UnityDialogWindow::windowNotify(CompWindowNotify n)
 case CompWindowNotifyFrameUpdate:
 
 if (mParent)
- moveToRect(mParent->serverBorderRect(), true);
+	moveToRect(mParent->serverBorderRect());
 
 default:
 break;
@@ -977,7 +973,7 @@ UnityDialogWindow::moveNotify(int dx, int dy, bool immediate)
 }
 else if (mParent)
 {
- moveToRect(mParent->serverBorderRect(), true);
+ moveToRect(mParent->serverBorderRect());
 }
 else
 moveTransientsToRect(window, window->serverBorderRect(), true);
@@ -1200,7 +1196,7 @@ UnityDialogWindow::moveTransientsToRect(CompWindow* skip, CompRect currentRect,
 if (cw == skip)
 return;
 
- UnityDialogWindow::get(cw)->moveToRect(currentRect, sync);
+ UnityDialogWindow::get(cw)->moveToRect(currentRect);
 
 /* Sync all of this window's transients */
 if (UnityDialogWindow::get(cw)->mTransients.size())
@@ -1225,9 +1221,6 @@ UnityDialogWindow::moveParentToRect(CompWindow* requestor,
 mParent->move(centeredPos.x() - mParent->borderRect().x(),
 centeredPos.y() - mParent->borderRect().y(), true);
 
- if (sync)
- mParent->syncPosition();
-
 UnityDialogWindow::get(mParent)->mSkipNotify = false;
 
 UnityDialogWindow::get(mParent)->moveTransientsToRect(requestor, window->serverBorderRect(), sync);
diff --git a/plugins/unitydialog/src/unitydialog.h b/plugins/unitydialog/src/unitydialog.h
index 652847540..1191b9418 100644
--- a/plugins/unitydialog/src/unitydialog.h
+++ b/plugins/unitydialog/src/unitydialog.h
@@ -309,7 +309,7 @@ public:
 void moveTransientsToRect(CompWindow* skip, CompRect rect, bool);
 void moveParentToRect(CompWindow* requestor, CompRect rect, bool);
 
- void moveToRect(CompRect currentRect, bool sync);
+ void moveToRect(CompRect currentRect);
 
 void grabTransients(CompWindow* skip, int x, int y,
 unsigned int state, unsigned int mask, bool);