← Back to branch summary

~ubuntu-branches/ubuntu/edgy/xorg-server/edgy-updates

« back to all changes in this revision

Viewing changes to dix/main.c

  • Committer: Bazaar Package Importer
  • Author(s): Rodrigo Parra Novo
  • Date: 2006-07-25 20:06:28 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20060725200628-gjmmd9gxfxdc4ejs
Tags: 1:1.1.1-0ubuntu1
* New Upstream version
* Changed Build-Depends from mesa-swrast-source to mesa-swx11-source,
  following Debian package nomenclature
* Re-did 12_security_policy_in_etc.diff for 1.1.1
* Dropped 15_security_allocate_local.diff (applied upstream)
* Dropped 16_SECURITY_setuid.diff (applied upstream)
* Dropped 000_ubuntu_fix_read_kernel_mapping.patch (applied upstream)
* Dropped 002_ubuntu_fix_for_certain_intel_chipsets.patch (applied upstream)
* Updated versioned Build-Depends on mesa-swx11-source to version
  6.5.0.cvs.20060725-0ubuntu1
* Added arrayobj.c, arrayobj.h, bitset.h & rbadaptors.h to
  GL/symlink-mesa.sh (linked from mesa-swx11-source)
* Added arrayobj.c to default build target on GL/mesa/main

Show diffs side-by-side

added added

removed removed

Lines of Context:
dix/main.c
1
 
/* $XdotOrg: xserver/xorg/dix/main.c,v 1.14 2005/07/03 08:53:38 daniels Exp $ */
 
1
/* $XdotOrg: xserver/xorg/dix/main.c,v 1.15 2006/02/15 20:44:12 ajax Exp $ */
2
2
/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
3
3
/***********************************************************
4
4
 
140
140
 
141
141
static void FreeScreen(ScreenPtr);
142
142
 
143
 
PaddingInfo PixmapWidthPaddingInfo[33];
 
143
_X_EXPORT PaddingInfo PixmapWidthPaddingInfo[33];
144
144
 
145
145
int connBlockScreenStart;
146
146
 
147
147
static int restart = 0;
148
148
 
149
 
void
 
149
_X_EXPORT void
150
150
NotImplemented(xEvent *from, xEvent *to)
151
151
{
152
152
    FatalError("Not implemented");
432
432
            InitRootWindow(WindowTable[i]);
433
433
        DefineInitialRootWindow(WindowTable[0]);
434
434
        SaveScreens(SCREEN_SAVER_FORCER, ScreenSaverReset);
435
 
#ifdef DPMSExtension
436
 
        SetDPMSTimers();
437
 
#endif
438
435
 
439
436
#ifdef PANORAMIX
440
437
        if (!noPanoramiXExtension) {
481
478
        WindowTable = NULL;
482
479
        FreeFonts();
483
480
 
484
 
#ifdef DPMSExtension
485
 
        FreeDPMSTimers();
486
 
#endif
487
481
        FreeAuditTimer();
488
482
 
489
483
        xfree(serverClient->devPrivates);