← Back to branch summary

~ubuntu-branches/ubuntu/maverick/xorg-server/maverick

« back to all changes in this revision

Viewing changes to hw/xquartz/mach-startup/stub.c

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington, Timo Aaltonen, Bryce Harrington
  • Date: 2010-03-24 12:04:20 UTC
  • mfrom: (1.1.32 upstream) (0.11.4 sid)
  • Revision ID: james.westby@ubuntu.com-20100324120420-qbk5la526uy4k8xe
Tags: 2:1.7.6-1ubuntu1
https://launchpad.net/bugs/401045
[Timo Aaltonen]
* Merge from Debian unstable.
* Drop patch 107, included in Debian.
* Drop patch 108, included upstream.
* control: Drop the udeb, we don't need it for lucid.
* control: Relax/drop some build-deps caused by the udeb.

[Bryce Harrington]
* Add 110_findglyphbyhash-fix.patch from upstream to fix a sporadic
  crash in FindGlyphByHash.
  (LP: #401045)
* Renumber patch 201_armel-drv-fallbacks.patch to 111

Show diffs side-by-side

added added

removed removed

Lines of Context:
hw/xquartz/mach-startup/stub.c
73
73
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
74
74
 
75
75
    CFURLRef appURL = NULL;
76
 
    CFBundleRef bundle = NULL;
77
76
    OSStatus osstatus = LSFindApplicationForInfo(kLSUnknownCreator, CFSTR(kX11AppBundleId), nil, nil, &appURL);
78
77
 
79
78
    switch (osstatus) {
84
83
                exit(1);
85
84
            }
86
85
 
87
 
            bundle = CFBundleCreate(NULL, appURL);
88
 
            if(!bundle) {
89
 
                fprintf(stderr, "Xquartz: Null value returned from CFBundleCreate().\n");
90
 
                exit(2);                
91
 
            }
92
 
 
93
86
            if (!CFURLGetFileSystemRepresentation(appURL, true, (unsigned char *)x11_path, sizeof(x11_path))) {
94
87
                fprintf(stderr, "Xquartz: Error resolving URL for %s\n", kX11AppBundleId);
95
88
                exit(3);