View | Details | Raw Unified
Collapse All | Expand All

(-) kioslave/media/mediamanager/halbackend.cpp (-17 / +15 lines)
 Lines 851-863    Link Here 
        result << tmp;
        result << tmp;
    }
    }
	if ( valids.contains("locale") )
	{
		value = config.readBoolEntry( "locale", true );
		tmp = QString( "locale=%1" ).arg( value ? "true" : "false" );
		result << tmp;
	}
    if (valids.contains("utf8"))
    if (valids.contains("utf8"))
    {
    {
        value = config.readBoolEntry("utf8", true);
        value = config.readBoolEntry("utf8", true);
 Lines 878-883    Link Here 
            result << "shortname=lower";
            result << "shortname=lower";
    }
    }
    if (valids.contains("locale"))
    {
        char *cType;
        if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) {
            result << QString("locale=%1").arg(cType);
        }
    }
    if (valids.contains("sync"))
    if (valids.contains("sync"))
    {
    {
        value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
        value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
 Lines 931-937    Link Here 
    QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options);
    QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options);
    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", "locale", 0 };
    const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
    for (int index = 0; names[index]; ++index)
    for (int index = 0; names[index]; ++index)
        if (valids.contains(names[index]))
        if (valids.contains(names[index]))
            config.writeEntry(names[index], valids[names[index]] == "true");
            config.writeEntry(names[index], valids[names[index]] == "true");
 Lines 951-960    Link Here 
        config.writeEntry("automount", valids["automount"]);
        config.writeEntry("automount", valids["automount"]);
    }
    }
	if (valids.contains("locale") ) {
		config.writeEntry("locale", valids["locale"]);
	}
    return true;
    return true;
}
}
 Lines 1153-1163    Link Here 
        soptions << QString("uid=%1").arg(getuid());
        soptions << QString("uid=%1").arg(getuid());
    }
    }
    if (valids["locale"] == "true")
	{
		soptions << QString("locale=%1").arg( KGlobal::locale()->language() ); 
	}
    if (valids["ro"] == "true")
    if (valids["ro"] == "true")
        soptions << "ro";
        soptions << "ro";
 Lines 1182-1187    Link Here 
        soptions << QString("shortname=%1").arg(valids["shortname"]);
        soptions << QString("shortname=%1").arg(valids["shortname"]);
    }
    }
    if (valids.contains("locale"))
    {
        soptions << QString("locale=%1").arg(valids["locale"]);
    }
    if (valids.contains("journaling"))
    if (valids.contains("journaling"))
    {
    {
        QString option = valids["journaling"];
        QString option = valids["journaling"];