← Back to branch summary

~ubuntu-branches/debian/sid/kde-style-qtcurve/sid

« back to all changes in this revision

Viewing changes to common/config_file.c

  • Committer: Bazaar Package Importer
  • Author(s): Fathi Boudra
  • Date: 2010-07-22 09:48:45 UTC
  • mfrom: (15.1.4 squeeze)
  • Revision ID: james.westby@ubuntu.com-20100722094845-avzmjjnbe53nk9li
Tags: 1.5.2-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/config_file.c
1292
1292
    if(src && dest && src!=dest)
1293
1293
    {
1294
1294
        memcpy(dest, src, sizeof(Options));
1295
 
        src->noBgndGradientApps=src->noBgndOpacityApps=src->noBgndImageApps=src->noDlgFixApps=src->noMenuStripeApps=NULL;
 
1295
        dest->noBgndGradientApps=src->noBgndGradientApps;
 
1296
        dest->noBgndOpacityApps=src->noBgndOpacityApps;
 
1297
        dest->noMenuBgndOpacityApps=src->noMenuBgndOpacityApps;
 
1298
        dest->noBgndImageApps=src->noBgndImageApps;
 
1299
        dest->noDlgFixApps=src->noDlgFixApps;
 
1300
        dest->noMenuStripeApps=src->noMenuStripeApps;
 
1301
        src->noBgndGradientApps=src->noBgndOpacityApps=src->noMenuBgndOpacityApps=src->noBgndImageApps=src->noDlgFixApps=src->noMenuStripeApps=NULL;
1296
1302
        memcpy(dest->customShades, src->customShades, sizeof(double)*NUM_STD_SHADES);
1297
1303
        memcpy(dest->customAlphas, src->customAlphas, sizeof(double)*NUM_STD_ALPHAS);
1298
1304
        copyGradients(src, dest);
1309
1315
            g_strfreev(opts->noBgndGradientApps);
1310
1316
        if(opts->noBgndOpacityApps)
1311
1317
            g_strfreev(opts->noBgndOpacityApps);
 
1318
        if(opts->noMenuBgndOpacityApps)
 
1319
            g_strfreev(opts->noMenuBgndOpacityApps);
1312
1320
        if(opts->noBgndImageApps)
1313
1321
            g_strfreev(opts->noBgndImageApps);
1314
1322
        if(opts->noDlgFixApps)
1315
1323
            g_strfreev(opts->noDlgFixApps);       
1316
1324
        if(opts->noMenuStripeApps)
1317
1325
            g_strfreev(opts->noMenuStripeApps); 
 
1326
        opts->noBgndGradientApps=opts->noBgndOpacityApps=opts->noMenuBgndOpacityApps=opts->noBgndImageApps=opts->noDlgFixApps=opts->noMenuStripeApps=NULL;
1318
1327
        for(i=0; i<NUM_CUSTOM_GRAD; ++i)
1319
1328
            if(opts->customGradient[i])
1320
1329
            {
1321
1330
                if(opts->customGradient[i]->stops)
1322
1331
                    free(opts->customGradient[i]->stops);
1323
1332
                free(opts->customGradient[i]);
 
1333
                opts->customGradient[i]=NULL;
1324
1334
            }
1325
1335
    }
1326
1336
}
1411
1421
            Options newOpts;
1412
1422
            Options *def=&newOpts;
1413
1423
 
 
1424
            opts->noBgndGradientApps=opts->noBgndOpacityApps=opts->noMenuBgndOpacityApps=opts->noBgndImageApps=opts->noDlgFixApps=opts->noMenuStripeApps=NULL;
 
1425
            for(i=0; i<NUM_CUSTOM_GRAD; ++i)
 
1426
                opts->customGradient[i]=NULL;
 
1427
            
1414
1428
            if(defOpts)
1415
1429
                copyOpts(defOpts, &newOpts);
1416
1430
            else
1734
1748
#if !defined __cplusplus || (defined QT_VERSION && (QT_VERSION >= 0x040000))
1735
1749
            CFG_READ_STRING_LIST(noBgndGradientApps)
1736
1750
            CFG_READ_STRING_LIST(noBgndOpacityApps)
 
1751
            CFG_READ_STRING_LIST(noMenuBgndOpacityApps)
1737
1752
            CFG_READ_STRING_LIST(noBgndImageApps)
1738
1753
#endif 
1739
1754
#if defined QT_VERSION && (QT_VERSION >= 0x040000)
2365
2380
    opts->menubarApps << "amarok" << "arora" << "kaffeine" << "kcalc" << "smplayer" << "VirtualBox";
2366
2381
    opts->statusbarApps << "kde";
2367
2382
    opts->useQtFileDialogApps << "googleearth-bin";
2368
 
    opts->noBgndOpacityApps << "smplayer" << "amarok" << "dragon" << "kscreenlocker";
 
2383
    opts->noBgndOpacityApps << "smplayer" << "amarok" << "dragon" << "kscreenlocker" << "inkscape";
 
2384
    opts->noMenuBgndOpacityApps << "inkscape";
2369
2385
#endif
2370
2386
    opts->noDlgFixApps << "kate" << "plasma" << "plasma-desktop" << "plasma-netbook";
2371
2387
    opts->noMenuStripeApps << "gtk" << "soffice.bin";
2372
2388
#else
2373
2389
    opts->noBgndGradientApps=NULL;
2374
 
    opts->noBgndOpacityApps=NULL;
 
2390
    opts->noBgndOpacityApps=g_strsplit("inkscape",",", -1);;
2375
2391
    opts->noBgndImageApps=NULL;
2376
2392
    opts->noDlgFixApps=NULL;
2377
2393
    opts->noMenuStripeApps=g_strsplit("gtk",",", -1);
 
2394
    opts->noMenuBgndOpacityApps=g_strsplit("inkscape",",", -1);
2378
2395
/*
2379
2396
    opts->setDialogButtonOrder=false;
2380
2397
*/
3089
3106
#if defined QT_VERSION && (QT_VERSION >= 0x040000)
3090
3107
        CFG_WRITE_STRING_LIST_ENTRY(noBgndGradientApps)
3091
3108
        CFG_WRITE_STRING_LIST_ENTRY(noBgndOpacityApps)
 
3109
        CFG_WRITE_STRING_LIST_ENTRY(noMenuBgndOpacityApps)
3092
3110
        CFG_WRITE_STRING_LIST_ENTRY(noBgndImageApps)
3093
3111
        CFG_WRITE_STRING_LIST_ENTRY(noDlgFixApps)
3094
3112
        CFG_WRITE_STRING_LIST_ENTRY(noMenuStripeApps)