diff options
| author | Aaron Plattner <aplattner@nvidia.com> | 2008-08-21 12:32:34 -0700 |
|---|---|---|
| committer | Aaron Plattner <aplattner@nvidia.com> | 2008-08-21 12:32:34 -0700 |
| commit | 7d794f81cbf3f1d6085902dcdd768936ee97163c (patch) | |
| tree | 8f4c8b9dd5dcacce652f48a30651d59c1799dce2 | |
| parent | 1a4383b08d8a905d4813b9d6c6f63988be0636e5 (diff) | |
| -rw-r--r-- | XF86Config-parser/Generate.c | 19 | ||||
| -rw-r--r-- | XF86Config-parser/Merge.c | 5 | ||||
| -rw-r--r-- | nvidia-xconfig.c | 2 |
3 files changed, 7 insertions, 19 deletions
diff --git a/XF86Config-parser/Generate.c b/XF86Config-parser/Generate.c index 0b6c9bd..22ce212 100644 --- a/XF86Config-parser/Generate.c +++ b/XF86Config-parser/Generate.c @@ -48,7 +48,6 @@ static int is_file(const char *filename); -static void add_files(GenerateOptions *gop, XConfigPtr config); static void add_font_path(GenerateOptions *gop, XConfigPtr config); static void add_modules(GenerateOptions *gop, XConfigPtr config); @@ -72,7 +71,7 @@ XConfigPtr xconfigGenerate(GenerateOptions *gop) /* add files, fonts, and modules */ - add_files(gop, config); + config->files = xconfigAlloc(sizeof(XConfigFilesRec)); add_font_path(gop, config); add_modules(gop, config); @@ -255,22 +254,6 @@ static char *find_libdir(GenerateOptions *gop) /* - * add_files() - - */ - -static void add_files(GenerateOptions *gop, XConfigPtr config) -{ - char *libdir = find_libdir(gop); - - config->files = xconfigAlloc(sizeof(XConfigFilesRec)); - config->files->rgbpath = xconfigStrcat(libdir, "/X11/rgb", NULL); - - free(libdir); - -} /* add_files() */ - - -/* * add_font_path() - scan through the __font_paths[] array, * temporarily chop off the ":unscaled" appendage, and check for the * file "fonts.dir" in the directory. If fonts.dir exists, append the diff --git a/XF86Config-parser/Merge.c b/XF86Config-parser/Merge.c index aaf66bc..7d8ab98 100644 --- a/XF86Config-parser/Merge.c +++ b/XF86Config-parser/Merge.c @@ -479,6 +479,7 @@ static int xconfigMergeDisplays(XConfigScreenPtr dstScreen, /* Free all the displays in the destination screen */ xconfigFreeDisplayList(dstScreen->displays); + dstScreen->displays = NULL; /* Copy all te displays */ @@ -530,6 +531,10 @@ static int xconfigMergeDisplays(XConfigScreenPtr dstScreen, srcMode = srcMode->next; } + + dstScreen->displays = + (XConfigDisplayPtr)xconfigAddListItem((GenericListPtr)(dstScreen->displays), + (GenericListPtr)dstDisplay); } return 1; diff --git a/nvidia-xconfig.c b/nvidia-xconfig.c index dea1985..94b262c 100644 --- a/nvidia-xconfig.c +++ b/nvidia-xconfig.c @@ -59,7 +59,7 @@ static void print_version(void) fmtoutp(TAB, "This program is used to manipulate X configuration files, " "specifically to enable NVIDIA X driver functionality."); fmtout(""); - fmtoutp(TAB, "Copyright (C) 2005 NVIDIA Corporation."); + fmtoutp(TAB, "Copyright (C) 2005 - 2008 NVIDIA Corporation."); fmtout(""); } /* print_version() */ |