← Back to branch summary

~compiz-team/compiz-core/compiz-core.decorator

« back to all changes in this revision

Viewing changes to src/main.cpp

  • Committer: Sam Spilsbury
  • Date: 2011-10-26 23:16:17 UTC
  • mfrom: (2880.2.1 compiz-core)
  • Revision ID: sam.spilsbury@canonical.com-20111026231617-d3fjg47i5areyw3p
Merge lp:~compiz-team/compiz-core/compiz-core.fix_873389

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main.cpp
234
234
                                                                   screen->priv)));
235
235
    }
236
236
 
237
 
    if (!disableSm)
238
 
        CompSession::init (clientId);
 
237
     if (!disableSm)
 
238
     {
 
239
        if (clientId == NULL)
 
240
        {
 
241
            char *desktop_autostart_id = getenv ("DESKTOP_AUTOSTART_ID");
 
242
            if (desktop_autostart_id != NULL)
 
243
                clientId = strdup (desktop_autostart_id);
 
244
            unsetenv ("DESKTOP_AUTOSTART_ID");
 
245
        }
 
246
        CompSession::init (clientId);
 
247
     }
239
248
 
240
249
    return true;
241
250
}