~vanvugt/compiz-core/fix-963470

« back to all changes in this revision

Viewing changes to src/window.cpp

Committer: Sam Spilsbury
Author(s): Andrea Azzarone
Date: 2011-07-27 16:13:28 UTC
mfrom: (2773.1.4 compiz-core)
mto: (2778.1.2 compiz-core)
mto: This revision was merged to the branch mainline in revision 2851.
Revision ID: sam.spilsbury@canonical.com-20110727161328-4zgw8sau9x0usrfi

Merge in lp:~andyrock/compiz-core/fix-1309

files added:
cmake/CompizGSettings.cmake

cmake/plugin_extensions/CompizGenGSettings.cmake

xslt/compiz_gsettings_schemas.xslt.in

files renamed:
cmake/CompizGSettings.cmake => cmake/CompizGSettings.cmake.moved

cmake/plugin_extensions/CompizGenGSettings.cmake => cmake/plugin_extensions/CompizGenGSettings.cmake.moved

xslt/compiz_gsettings_schemas.xslt.in => xslt/compiz_gsettings_schemas.xslt.in.moved

files modified:
src/window.cpp

Show diffs side-by-side

added added

removed removed

src/window.cpp

5210

5211

startupId = getStartupId ();

5212

5213

if (oldId)

5213

if (oldId && startupId)

5214

{

5215

if (strcmp (startupId, oldId) == 0)

5216

newId = false;

5217

5218

free (oldId);

5219

5217

}

5220

5218

5221

5219

if (managed && startupId && newId)

5246

5244

if (allowWindowFocus (0, timestamp))

5247

5245

window->activate ();

5248

5246

}

5247

5248

if (oldId)

5249

free (oldId);

5249

5250

}

5250

5251

5252

bool

Older »