summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSam Spilsbury <sam.spilsbury@canonical.com>2010-12-07 17:03:53 +0800
committerSam Spilsbury <sam.spilsbury@canonical.com>2010-12-07 17:03:53 +0800
commit16e02c0c4ab78b2d5a9481b8fb4544201346166d (patch)
tree06d9ade64936432d1d0b127aa399e10c6ceb8e1e /src
parent253706a7784bc6700839af68d3416be6536afb60 (diff)
downloadcompiz-with-glib-mainloop-16e02c0c4ab78b2d5a9481b8fb4544201346166d.tar.gz
compiz-with-glib-mainloop-16e02c0c4ab78b2d5a9481b8fb4544201346166d.tar.bz2
Fix up coding style, add some comments.
Forward port 24dd71f04892ddd031ac2bf7b166e10b74aa1bbd to master
Diffstat (limited to 'src')
-rw-r--r--src/screen.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/screen.cpp b/src/screen.cpp
index 67f097b..f211998 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -824,6 +824,8 @@ PrivateScreen::updatePlugins ()
}
}
+ /* dupPluginCount is now the number of plugisn contained in both the
+ * initial and new plugins list */
pList.resize (1 + initialPlugins.size () + list.size () - dupPluginCount);
if (pList.empty ())
@@ -832,14 +834,18 @@ PrivateScreen::updatePlugins ()
return;
}
+ /* Must have core as first plugin */
pList.at (0) = "core";
j = 1;
+
+ /* Add initial plugins */
foreach (CompString &p, initialPlugins)
{
pList.at (j).set (p);
j++;
}
+ /* Add plugins not in the initial list */
foreach (CompOption::Value &opt, list)
{
std::list <CompString>::iterator it = initialPlugins.begin ();