← Back to branch summary

~maco.m/ubuntu/oneiric/nvidia-settings/fix-missing-dependencies-for-kubuntu

« back to all changes in this revision

Viewing changes to src/config-file.c

  • Committer: Bazaar Package Importer
  • Author(s): Alberto Milone
  • Date: 2010-01-10 12:12:42 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20100110121242-oobaomn95w8p3a60
Tags: 190.53-0ubuntu1
https://launchpad.net/bugs/417410
https://launchpad.net/bugs/200868
* New upstream release (LP: #417410).
* debian/control:
  - Add build dependency on cdbs.
  - Remove build dependency on dpatch.
  - Add lpia architecture.
  - Depend on screen-resolution-extra >= 0.12.
* debian/patches/02_nvidia-settings-format-string.patch:
  - Patch from Mandriva to pass formatted strings to gtk dialogs (thus
    reducing gtk warnings).
* debian/patches/03_xf86vidmode-rampsize-check.patch:
  - Fix FTBFS with recent versions of XF86VidMode.
* debian/patches/04_include_xf86vmproto.patch:
 - Include xf86vmproto.h so as to get back XF86VidModeGetGammaRampSize().
* debian/patches/05_polkit.patch:
  - Add support for PolicyKit so that nvidia-settings doesn't require
    that users call it with sudo to edit xorg.conf (LP: #200868)
    (requires screen-resolution-extra >= 0.12).
* debian/rules:
  - Switch to CDBS.
  - Do not provide a desktop file. The different nvidia packages will
    deal with it.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/config-file.c
214
214
    NVCTRLAttributeValidValuesRec valid;
215
215
    uint32 mask;
216
216
    CtrlHandleTarget *t;
217
 
    char *tmp_d_str, *tmp, *prefix, scratch[4];
 
217
    char *tmp_d_str, *prefix, scratch[4];
 
218
    const char *tmp;
218
219
    char *locale = "C";
219
220
 
220
221
    stream = fopen(filename, "w");
386
387
            continue;
387
388
        }
388
389
 
389
 
        tmp = nv_get_attribute_name(p->attr);
 
390
        tmp = nv_get_attribute_name(p->attr, NV_PARSER_TYPE_STRING_ATTRIBUTE,
 
391
                                    p->flags);
390
392
        if (!tmp) {
391
393
            nv_error_msg("Failure to save unknown attribute %d.", p->attr);
392
394
            p = p->next;