summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-11-20 10:14:50 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-11-20 10:14:50 +0800
commit368b5f77bbeee3b401a40efe5b631b5d7e841c76 (patch)
treec5f4151e43ed86b900e40c94fee1202abcfec46d /src
parentd31d55fa24835dde6c4949adf223dc83ab4c2b6f (diff)
downloadcompiz-with-glib-mainloop-368b5f77bbeee3b401a40efe5b631b5d7e841c76.tar.gz
compiz-with-glib-mainloop-368b5f77bbeee3b401a40efe5b631b5d7e841c76.tar.bz2
Only use ::reset for the RefPtr because that will automatically take care of destroying it for us
Diffstat (limited to 'src')
-rw-r--r--src/screen.cpp5
1 files changed, 0 insertions, 5 deletions
diff --git a/src/screen.cpp b/src/screen.cpp
index b9d59b5..314b6f2 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -146,7 +146,6 @@ CompEventSource::callback ()
{
if (restartSignal || shutDown)
{
- screen->priv->source->destroy ();
screen->priv->source.reset ();
screen->priv->mainloop->quit ();
}
@@ -269,10 +268,7 @@ CompTimer::internalCallback ()
else
{
if (mSource)
- {
- mSource->destroy ();
mSource.reset ();
- }
return false;
}
}
@@ -306,7 +302,6 @@ PrivateScreen::removeTimer (CompTimer *timer)
if (timer->mExecuting)
timer->mForceFail = true;
- timer->mSource->destroy ();
timer->mSource.reset (); /* This will NULL the pointer */
}