← Back to branch summary

~sil2100/compiz-core/fglrx_final_fix

« back to all changes in this revision

Viewing changes to src/main.cpp

  • Committer: Daniel van Vugt
  • Date: 2012-04-20 07:23:28 UTC
  • mto: This revision was merged to the branch mainline in revision 3105.
  • Revision ID: daniel.van.vugt@canonical.com-20120420072328-yfax0wxvg7bd6bu6
Remove redundant code - CompManager::plugins

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.cpp
118
118
        }
119
119
        else
120
120
        {
121
 
            plugins.push_back (argv[i]);
 
121
            initialPlugins.push_back (argv[i]);
122
122
        }
123
123
    }
124
124
 
125
 
    initialPlugins = plugins;
126
 
 
127
125
    return true;
128
126
}
129
127
 
148
146
 
149
147
    modHandler = new ModifierHandler ();
150
148
 
151
 
    if (!plugins.empty ())
 
149
    if (!initialPlugins.empty ())
152
150
    {
153
151
        CompOption::Value::Vector list;
154
152
        CompOption::Value         value;
155
153
        CompOption                *o = screen->getOption ("active_plugins");
156
154
 
157
 
        foreach (CompString &str, plugins)
 
155
        foreach (CompString &str, initialPlugins)
158
156
        {
159
157
            value.set (str);
160
158
            list.push_back (value);