Attachment #778 for bug #1165

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1165
Collapse All | Expand All





    int val = cfg->readNumEntry (specialOptions[num].kdeName);

    ccsSetInt (setting, val, false);
}

static void


    Bool val = (cfg->readBoolEntry (specialOptions[num].kdeName))? TRUE : FALSE;

    ccsSetBool (setting, val, false);
}

static void

    {
	keySet.keysym = kdeKeysym;
	keySet.keyModMask = kdeKeymod;
	ccsSetKey (setting, keySet, false);
    }
}


    case OptionSpecial:
	if (specialOptions[option].settingName == "command11")
	{
	    ccsSetString (setting, "xkill", false);
	}
	else if (specialOptions[option].settingName == "unmaximize_window_key"
		 || specialOptions[option].settingName == "maximize_window_key"


	    keyVal.keyModMask = 0;

	    ccsSetKey (setting, keyVal, false);
	}
	else if (specialOptions[option].settingName == "click_to_focus")
	{
	    Bool val = (cFiles->kwin->readEntry ("FocusPolicy") ==
			    "ClickToFocus") ? TRUE : FALSE;
	    ccsSetBool (setting, val, false);
	}
	else if (specialOptions[option].settingName == "number_of_desktops")
	{

		    result = 2;
	    }

	    ccsSetInt (setting, result, false);
	}
	else if (specialOptions[option].settingName == "snap_type")
	{
	    static int intList[2] = {0, 1};
	    CCSSettingValueList list = ccsGetValueListFromIntArray (intList, 2,
								    setting);
	    ccsSetList (setting, list, false);
	    ccsSettingValueListFree (list, TRUE);
	}
	else if (specialOptions[option].settingName == "resistance_distance" ||

		result =  cFiles->main->readNumEntry ("snap_distance (Integrated)");
	    
	    if (result > 0)
	    	ccsSetInt (setting, result, false);
	}
	else if (specialOptions[option].settingName == "edges_categories")
	{

	    CCSSettingValueList list = ccsGetValueListFromIntArray (intList,
								    num,
								    setting);
	    ccsSetList (setting, list, false);
	    ccsSettingValueListFree (list, TRUE);
	}
	else if (specialOptions[option].settingName == "next_key" ||

		{
		    keyVal.keysym = 0;
		    keyVal.keyModMask = 0;
		    ccsSetKey (setting, keyVal, false);
		}
	    }
	}

		{
		    keyVal.keysym = 0;
		    keyVal.keyModMask = 0;
		    ccsSetKey (setting, keyVal, false);
		}
	    }
	}

		{
		    keyVal.keysym = 0;
		    keyVal.keyModMask = 0;
		    ccsSetKey (setting, keyVal, false);
		}
	    }
	}

	    int val = cFiles->kwin->readNumEntry ("ElectricBorders");

	    if (val > 0)
		ccsSetBool (setting, TRUE, false);
	    else
		ccsSetBool (setting, FALSE, false);
	}
	else if (specialOptions[option].settingName == "edge_flip_pointer" ||
		 specialOptions[option].settingName == "edgeflip_pointer")

	    int val = cFiles->kwin->readNumEntry ("ElectricBorders");

	    if (val > 1)
		ccsSetBool (setting, TRUE, false);
	    else
		ccsSetBool (setting, FALSE, false);
	}
	else if (specialOptions[option].settingName == "mode" &&
		 specialOptions[option].pluginName == "place")

	    else if (mode == "Centered")
		result = 1;

	    ccsSetInt (setting, result, false);
	}
	break;


	    TQString profile = str.right (str.length() - 9);

	    if (!profile.isEmpty() )
	    {
		CCSString* a;
		a->value = strdup (profile.ascii());
		a->refCount = 0;
		ret = ccsStringListAppend (ret, a );
	    }
	}
    }


    TQString key (setting->name);
    TQString group (setting->parent->name);

    group += "_display";
    {
	group += "_screen";
	group += TQString::number (setting->screenNum);
    }
    else
	group += "_display";

    cfg->setGroup (group);



    if (!cfg->hasKey (key) )
    {
	ccsResetToDefault (setting, false);
	return;
    }


    {

    case TypeString:
	ccsSetString (setting, cfg->readEntry (key, "").ascii(), false );
	break;

    case TypeMatch:
	ccsSetMatch (setting, cfg->readEntry (key, "").ascii(), false );
	break;

    case TypeFloat:
	ccsSetFloat (setting, cfg->readDoubleNumEntry (key), false );
	break;

    case TypeInt:
	ccsSetInt (setting, cfg->readNumEntry (key), false );
	break;

    case TypeBool:
	{
	    Bool val = (cfg->readBoolEntry (key) ) ? TRUE : FALSE;
	    ccsSetBool (setting, val, false);
	}
	break;


		color.color.alpha = c[3] << 8 | c[3];
	    }

	    ccsSetColor (setting, color, false);
	}
	break;


		    CCSSettingValueList l =

			ccsGetValueListFromBoolArray (array, i, setting);
		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);
		    delete array;
		}

		    CCSSettingValueList l =

			ccsGetValueListFromIntArray (array, i, setting);
		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);
		    delete array;
		}

		    CCSSettingValueList l =

			ccsGetValueListFromStringArray (array, i, setting);
		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);

		    for (int j = 0; j < i; j++)

		    CCSSettingValueList l =

			ccsGetValueListFromStringArray (array, i, setting);
		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);

		    for (int j = 0; j < i; j++)

		    CCSSettingValueList l =

			ccsGetValueListFromFloatArray (array, i, setting);
		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);
		    delete array;
		}

		    CCSSettingValueList l =

			ccsGetValueListFromColorArray (array, i, setting);
		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);
		    delete array;
		}

			    free (val);
		    }

		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);
		}
		break;

			    free (val);
		    }

		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);
		}
		break;

			l = ccsSettingValueListAppend (l, val);
		    }

		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);
		}
		break;

			l = ccsSettingValueListAppend (l, val);
		    }

		    ccsSetList (setting, l, false);
		    ccsSettingValueListFree (l, TRUE);
		}
		break;


	    ccsStringToKeyBinding (str.ascii(), &value);

	    ccsSetKey (setting, value, false);
	}
	break;
    case TypeButton:


	    ccsStringToButtonBinding (str.ascii(), &value);

	    ccsSetButton (setting, value, false);
	}
	break;
    case TypeEdge:


	    value = ccsStringToEdges (str.ascii());

	    ccsSetEdge (setting, value, false);
	}
	break;
    case TypeBell:
	{
	    Bool val = (cfg->readBoolEntry (key)) ? TRUE : FALSE;
	    ccsSetBell (setting, val, false);
	}
	break;


	    int iVal = 0;

	    CCSSetting *edges = ccsFindSetting(setting->parent,
					       "edges_categories");
					       setting->isScreen,
					       setting->screenNum);

	    CCSSetting *dist = ccsFindSetting(setting->parent,
					      "resistance_distance");
					      setting->isScreen,
					      setting->screenNum);

	    if (!edges || !dist || !ccsGetList (edges, &sList) ||
		!ccsGetInt(dist, &iVal))



	    CCSSetting *valSet = ccsFindSetting(setting->parent,
						 "edge_flip_window");
						 setting->isScreen,
						 setting->screenNum);

	    if (!valSet)
	     	valSet = ccsFindSetting(setting->parent,
					       	"edgeflip_move");

	    if (valSet && ccsGetBool (valSet, &val2))
	    {

    TQString key (setting->name);
    TQString group (setting->parent->name);

    group += "_display";
    {
	group += "_screen";
	group += TQString::number (setting->screenNum);
    }
    else
	group += "_display";

    cfg->setGroup (group);


Return to bug 1165

Lines 249-255 Link Here

(-)compizconfig-backend-kconfig/settings-backend/kconfig_backend.cpp.compiz (-65 / +52 lines)
249		249
250	int val = cfg->readNumEntry (specialOptions[num].kdeName);	250	int val = cfg->readNumEntry (specialOptions[num].kdeName);
251		251
252	ccsSetInt (setting, val);	252	ccsSetInt (setting, val, false);
253	}	253	}
254		254
255	static void	255	static void
Lines 260-266 Link Here
260		260
261	Bool val = (cfg->readBoolEntry (specialOptions[num].kdeName))? TRUE : FALSE;	261	Bool val = (cfg->readBoolEntry (specialOptions[num].kdeName))? TRUE : FALSE;
262		262
263	ccsSetBool (setting, val);	263	ccsSetBool (setting, val, false);
264	}	264	}
265		265
266	static void	266	static void
Lines 292-298 Link Here
292	{	292	{
293	keySet.keysym = kdeKeysym;	293	keySet.keysym = kdeKeysym;
294	keySet.keyModMask = kdeKeymod;	294	keySet.keyModMask = kdeKeymod;
295	ccsSetKey (setting, keySet);	295	ccsSetKey (setting, keySet, false);
296	}	296	}
297	}	297	}
298		298
Lines 330-336 Link Here
330	case OptionSpecial:	330	case OptionSpecial:
331	if (specialOptions[option].settingName == "command11")	331	if (specialOptions[option].settingName == "command11")
332	{	332	{
333	ccsSetString (setting, "xkill");	333	ccsSetString (setting, "xkill", false);
334	}	334	}
335	else if (specialOptions[option].settingName == "unmaximize_window_key"	335	else if (specialOptions[option].settingName == "unmaximize_window_key"
336	\|\| specialOptions[option].settingName == "maximize_window_key"	336	\|\| specialOptions[option].settingName == "maximize_window_key"
Lines 346-358 Link Here
346		346
347	keyVal.keyModMask = 0;	347	keyVal.keyModMask = 0;
348		348
349	ccsSetKey (setting, keyVal);	349	ccsSetKey (setting, keyVal, false);
350	}	350	}
351	else if (specialOptions[option].settingName == "click_to_focus")	351	else if (specialOptions[option].settingName == "click_to_focus")
352	{	352	{
353	Bool val = (cFiles->kwin->readEntry ("FocusPolicy") ==	353	Bool val = (cFiles->kwin->readEntry ("FocusPolicy") ==
354	"ClickToFocus") ? TRUE : FALSE;	354	"ClickToFocus") ? TRUE : FALSE;
355	ccsSetBool (setting, val);	355	ccsSetBool (setting, val, false);
356	}	356	}
357	else if (specialOptions[option].settingName == "number_of_desktops")	357	else if (specialOptions[option].settingName == "number_of_desktops")
358	{	358	{
Lines 387-400 Link Here
387	result = 2;	387	result = 2;
388	}	388	}
389		389
390	ccsSetInt (setting, result);	390	ccsSetInt (setting, result, false);
391	}	391	}
392	else if (specialOptions[option].settingName == "snap_type")	392	else if (specialOptions[option].settingName == "snap_type")
393	{	393	{
394	static int intList[2] = {0, 1};	394	static int intList[2] = {0, 1};
395	CCSSettingValueList list = ccsGetValueListFromIntArray (intList, 2,	395	CCSSettingValueList list = ccsGetValueListFromIntArray (intList, 2,
396	setting);	396	setting);
397	ccsSetList (setting, list);	397	ccsSetList (setting, list, false);
398	ccsSettingValueListFree (list, TRUE);	398	ccsSettingValueListFree (list, TRUE);
399	}	399	}
400	else if (specialOptions[option].settingName == "resistance_distance" \|\|	400	else if (specialOptions[option].settingName == "resistance_distance" \|\|
Lines 408-414 Link Here
408	result = cFiles->main->readNumEntry ("snap_distance (Integrated)");	408	result = cFiles->main->readNumEntry ("snap_distance (Integrated)");
409		409
410	if (result > 0)	410	if (result > 0)
411	ccsSetInt (setting, result);	411	ccsSetInt (setting, result, false);
412	}	412	}
413	else if (specialOptions[option].settingName == "edges_categories")	413	else if (specialOptions[option].settingName == "edges_categories")
414	{	414	{
Lines 428-434 Link Here
428	CCSSettingValueList list = ccsGetValueListFromIntArray (intList,	428	CCSSettingValueList list = ccsGetValueListFromIntArray (intList,
429	num,	429	num,
430	setting);	430	setting);
431	ccsSetList (setting, list);	431	ccsSetList (setting, list, false);
432	ccsSettingValueListFree (list, TRUE);	432	ccsSettingValueListFree (list, TRUE);
433	}	433	}
434	else if (specialOptions[option].settingName == "next_key" \|\|	434	else if (specialOptions[option].settingName == "next_key" \|\|
Lines 451-457 Link Here
451	{	451	{
452	keyVal.keysym = 0;	452	keyVal.keysym = 0;
453	keyVal.keyModMask = 0;	453	keyVal.keyModMask = 0;
454	ccsSetKey (setting, keyVal);	454	ccsSetKey (setting, keyVal, false);
455	}	455	}
456	}	456	}
457	}	457	}
Lines 475-481 Link Here
475	{	475	{
476	keyVal.keysym = 0;	476	keyVal.keysym = 0;
477	keyVal.keyModMask = 0;	477	keyVal.keyModMask = 0;
478	ccsSetKey (setting, keyVal);	478	ccsSetKey (setting, keyVal, false);
479	}	479	}
480	}	480	}
481	}	481	}
Lines 494-500 Link Here
494	{	494	{
495	keyVal.keysym = 0;	495	keyVal.keysym = 0;
496	keyVal.keyModMask = 0;	496	keyVal.keyModMask = 0;
497	ccsSetKey (setting, keyVal);	497	ccsSetKey (setting, keyVal, false);
498	}	498	}
499	}	499	}
500	}	500	}
Lines 504-512 Link Here
504	int val = cFiles->kwin->readNumEntry ("ElectricBorders");	504	int val = cFiles->kwin->readNumEntry ("ElectricBorders");
505		505
506	if (val > 0)	506	if (val > 0)
507	ccsSetBool (setting, TRUE);	507	ccsSetBool (setting, TRUE, false);
508	else	508	else
509	ccsSetBool (setting, FALSE);	509	ccsSetBool (setting, FALSE, false);
510	}	510	}
511	else if (specialOptions[option].settingName == "edge_flip_pointer" \|\|	511	else if (specialOptions[option].settingName == "edge_flip_pointer" \|\|
512	specialOptions[option].settingName == "edgeflip_pointer")	512	specialOptions[option].settingName == "edgeflip_pointer")
Lines 514-522 Link Here
514	int val = cFiles->kwin->readNumEntry ("ElectricBorders");	514	int val = cFiles->kwin->readNumEntry ("ElectricBorders");
515		515
516	if (val > 1)	516	if (val > 1)
517	ccsSetBool (setting, TRUE);	517	ccsSetBool (setting, TRUE, false);
518	else	518	else
519	ccsSetBool (setting, FALSE);	519	ccsSetBool (setting, FALSE, false);
520	}	520	}
521	else if (specialOptions[option].settingName == "mode" &&	521	else if (specialOptions[option].settingName == "mode" &&
522	specialOptions[option].pluginName == "place")	522	specialOptions[option].pluginName == "place")
Lines 536-542 Link Here
536	else if (mode == "Centered")	536	else if (mode == "Centered")
537	result = 1;	537	result = 1;
538		538
539	ccsSetInt (setting, result);	539	ccsSetInt (setting, result, false);
540	}	540	}
541	break;	541	break;
542		542
Lines 629-635 Link Here
629	TQString profile = str.right (str.length() - 9);	629	TQString profile = str.right (str.length() - 9);
630		630
631	if (!profile.isEmpty() )	631	if (!profile.isEmpty() )
632	ret = ccsStringListAppend (ret, strdup (profile.ascii() ) );	632	{
		633	CCSString* a;
		634	a->value = strdup (profile.ascii());
		635	a->refCount = 0;
		636	ret = ccsStringListAppend (ret, a );
		637	}
633	}	638	}
634	}	639	}
635		640
Lines 646-658 Link Here
646	TQString key (setting->name);	651	TQString key (setting->name);
647	TQString group (setting->parent->name);	652	TQString group (setting->parent->name);
648		653
649	if (setting->isScreen)	654	group += "_display";
650	{
651	group += "_screen";
652	group += TQString::number (setting->screenNum);
653	}
654	else
655	group += "_display";
656		655
657	cfg->setGroup (group);	656	cfg->setGroup (group);
658		657
Lines 665-671 Link Here
665		664
666	if (!cfg->hasKey (key) )	665	if (!cfg->hasKey (key) )
667	{	666	{
668	ccsResetToDefault (setting);	667	ccsResetToDefault (setting, false);
669	return;	668	return;
670	}	669	}
671		670
Lines 673-697 Link Here
673	{	672	{
674		673
675	case TypeString:	674	case TypeString:
676	ccsSetString (setting, cfg->readEntry (key, "").ascii() );	675	ccsSetString (setting, cfg->readEntry (key, "").ascii(), false );
677	break;	676	break;
678		677
679	case TypeMatch:	678	case TypeMatch:
680	ccsSetMatch (setting, cfg->readEntry (key, "").ascii() );	679	ccsSetMatch (setting, cfg->readEntry (key, "").ascii(), false );
681	break;	680	break;
682		681
683	case TypeFloat:	682	case TypeFloat:
684	ccsSetFloat (setting, cfg->readDoubleNumEntry (key) );	683	ccsSetFloat (setting, cfg->readDoubleNumEntry (key), false );
685	break;	684	break;
686		685
687	case TypeInt:	686	case TypeInt:
688	ccsSetInt (setting, cfg->readNumEntry (key) );	687	ccsSetInt (setting, cfg->readNumEntry (key), false );
689	break;	688	break;
690		689
691	case TypeBool:	690	case TypeBool:
692	{	691	{
693	Bool val = (cfg->readBoolEntry (key) ) ? TRUE : FALSE;	692	Bool val = (cfg->readBoolEntry (key) ) ? TRUE : FALSE;
694	ccsSetBool (setting, val);	693	ccsSetBool (setting, val, false);
695	}	694	}
696	break;	695	break;
697		696
Lines 710-716 Link Here
710	color.color.alpha = c[3] << 8 \| c[3];	709	color.color.alpha = c[3] << 8 \| c[3];
711	}	710	}
712		711
713	ccsSetColor (setting, color);	712	ccsSetColor (setting, color, false);
714	}	713	}
715	break;	714	break;
716		715
Lines 737-743 Link Here
737	CCSSettingValueList l =	736	CCSSettingValueList l =
738		737
739	ccsGetValueListFromBoolArray (array, i, setting);	738	ccsGetValueListFromBoolArray (array, i, setting);
740	ccsSetList (setting, l);	739	ccsSetList (setting, l, false);
741	ccsSettingValueListFree (l, TRUE);	740	ccsSettingValueListFree (l, TRUE);
742	delete array;	741	delete array;
743	}	742	}
Lines 761-767 Link Here
761	CCSSettingValueList l =	760	CCSSettingValueList l =
762		761
763	ccsGetValueListFromIntArray (array, i, setting);	762	ccsGetValueListFromIntArray (array, i, setting);
764	ccsSetList (setting, l);	763	ccsSetList (setting, l, false);
765	ccsSettingValueListFree (l, TRUE);	764	ccsSettingValueListFree (l, TRUE);
766	delete array;	765	delete array;
767	}	766	}
Lines 789-795 Link Here
789	CCSSettingValueList l =	788	CCSSettingValueList l =
790		789
791	ccsGetValueListFromStringArray (array, i, setting);	790	ccsGetValueListFromStringArray (array, i, setting);
792	ccsSetList (setting, l);	791	ccsSetList (setting, l, false);
793	ccsSettingValueListFree (l, TRUE);	792	ccsSettingValueListFree (l, TRUE);
794		793
795	for (int j = 0; j < i; j++)	794	for (int j = 0; j < i; j++)
Lines 822-828 Link Here
822	CCSSettingValueList l =	821	CCSSettingValueList l =
823		822
824	ccsGetValueListFromStringArray (array, i, setting);	823	ccsGetValueListFromStringArray (array, i, setting);
825	ccsSetList (setting, l);	824	ccsSetList (setting, l, false);
826	ccsSettingValueListFree (l, TRUE);	825	ccsSettingValueListFree (l, TRUE);
827		826
828	for (int j = 0; j < i; j++)	827	for (int j = 0; j < i; j++)
Lines 851-857 Link Here
851	CCSSettingValueList l =	850	CCSSettingValueList l =
852		851
853	ccsGetValueListFromFloatArray (array, i, setting);	852	ccsGetValueListFromFloatArray (array, i, setting);
854	ccsSetList (setting, l);	853	ccsSetList (setting, l, false);
855	ccsSettingValueListFree (l, TRUE);	854	ccsSettingValueListFree (l, TRUE);
856	delete array;	855	delete array;
857	}	856	}
Lines 886-892 Link Here
886	CCSSettingValueList l =	885	CCSSettingValueList l =
887		886
888	ccsGetValueListFromColorArray (array, i, setting);	887	ccsGetValueListFromColorArray (array, i, setting);
889	ccsSetList (setting, l);	888	ccsSetList (setting, l, false);
890	ccsSettingValueListFree (l, TRUE);	889	ccsSettingValueListFree (l, TRUE);
891	delete array;	890	delete array;
892	}	891	}
Lines 913-919 Link Here
913	free (val);	912	free (val);
914	}	913	}
915		914
916	ccsSetList (setting, l);	915	ccsSetList (setting, l, false);
917	ccsSettingValueListFree (l, TRUE);	916	ccsSettingValueListFree (l, TRUE);
918	}	917	}
919	break;	918	break;
Lines 938-944 Link Here
938	free (val);	937	free (val);
939	}	938	}
940		939
941	ccsSetList (setting, l);	940	ccsSetList (setting, l, false);
942	ccsSettingValueListFree (l, TRUE);	941	ccsSettingValueListFree (l, TRUE);
943	}	942	}
944	break;	943	break;
Lines 960-966 Link Here
960	l = ccsSettingValueListAppend (l, val);	959	l = ccsSettingValueListAppend (l, val);
961	}	960	}
962		961
963	ccsSetList (setting, l);	962	ccsSetList (setting, l, false);
964	ccsSettingValueListFree (l, TRUE);	963	ccsSettingValueListFree (l, TRUE);
965	}	964	}
966	break;	965	break;
Lines 980-986 Link Here
980	l = ccsSettingValueListAppend (l, val);	979	l = ccsSettingValueListAppend (l, val);
981	}	980	}
982		981
983	ccsSetList (setting, l);	982	ccsSetList (setting, l, false);
984	ccsSettingValueListFree (l, TRUE);	983	ccsSettingValueListFree (l, TRUE);
985	}	984	}
986	break;	985	break;
Lines 999-1005 Link Here
999		998
1000	ccsStringToKeyBinding (str.ascii(), &value);	999	ccsStringToKeyBinding (str.ascii(), &value);
1001		1000
1002	ccsSetKey (setting, value);	1001	ccsSetKey (setting, value, false);
1003	}	1002	}
1004	break;	1003	break;
1005	case TypeButton:	1004	case TypeButton:
Lines 1010-1016 Link Here
1010		1009
1011	ccsStringToButtonBinding (str.ascii(), &value);	1010	ccsStringToButtonBinding (str.ascii(), &value);
1012		1011
1013	ccsSetButton (setting, value);	1012	ccsSetButton (setting, value, false);
1014	}	1013	}
1015	break;	1014	break;
1016	case TypeEdge:	1015	case TypeEdge:
Lines 1021-1033 Link Here
1021		1020
1022	value = ccsStringToEdges (str.ascii());	1021	value = ccsStringToEdges (str.ascii());
1023		1022
1024	ccsSetEdge (setting, value);	1023	ccsSetEdge (setting, value, false);
1025	}	1024	}
1026	break;	1025	break;
1027	case TypeBell:	1026	case TypeBell:
1028	{	1027	{
1029	Bool val = (cfg->readBoolEntry (key)) ? TRUE : FALSE;	1028	Bool val = (cfg->readBoolEntry (key)) ? TRUE : FALSE;
1030	ccsSetBell (setting, val);	1029	ccsSetBell (setting, val, false);
1031	}	1030	}
1032	break;	1031	break;
1033		1032
Lines 1205-1218 Link Here
1205	int iVal = 0;	1204	int iVal = 0;
1206		1205
1207	CCSSetting *edges = ccsFindSetting(setting->parent,	1206	CCSSetting *edges = ccsFindSetting(setting->parent,
1208	"edges_categories",	1207	"edges_categories");
1209	setting->isScreen,
1210	setting->screenNum);
1211		1208
1212	CCSSetting *dist = ccsFindSetting(setting->parent,	1209	CCSSetting *dist = ccsFindSetting(setting->parent,
1213	"resistance_distance",	1210	"resistance_distance");
1214	setting->isScreen,
1215	setting->screenNum);
1216		1211
1217	if (!edges \|\| !dist \|\| !ccsGetList (edges, &sList) \|\|	1212	if (!edges \|\| !dist \|\| !ccsGetList (edges, &sList) \|\|
1218	!ccsGetInt(dist, &iVal))	1213	!ccsGetInt(dist, &iVal))
Lines 1329-1341 Link Here
1329		1324
1330		1325
1331	CCSSetting *valSet = ccsFindSetting(setting->parent,	1326	CCSSetting *valSet = ccsFindSetting(setting->parent,
1332	"edge_flip_window",	1327	"edge_flip_window");
1333	setting->isScreen,
1334	setting->screenNum);
1335		1328
1336	if (!valSet)	1329	if (!valSet)
1337	valSet = ccsFindSetting(setting->parent, "edgeflip_move",	1330	valSet = ccsFindSetting(setting->parent,
1338	setting->isScreen, setting->screenNum);	1331	"edgeflip_move");
1339		1332
1340	if (valSet && ccsGetBool (valSet, &val2))	1333	if (valSet && ccsGetBool (valSet, &val2))
1341	{	1334	{
Lines 1399-1411 Link Here
1399	TQString key (setting->name);	1392	TQString key (setting->name);
1400	TQString group (setting->parent->name);	1393	TQString group (setting->parent->name);
1401		1394
1402	if (setting->isScreen)	1395	group += "_display";
1403	{
1404	group += "_screen";
1405	group += TQString::number (setting->screenNum);
1406	}
1407	else
1408	group += "_display";
1409		1396
1410	cfg->setGroup (group);	1397	cfg->setGroup (group);
1411		1398