Attachment #84203 for bug #129237

View | Details | Raw Unified | Return to bug 129237
Collapse All | Expand All

Lines 3-8 Link Here

(-)kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/computer-device-class.desktop (+1 lines)
3	Type=MimeType	3	Type=MimeType
4	MimeType=bluetooth/computer-device-class	4	MimeType=bluetooth/computer-device-class
5	Icon=konsole	5	Icon=konsole
		6	X-KDE-IsAlso=inode/directory
6	Comment=Computer/PDA Bluetooth Device	7	Comment=Computer/PDA Bluetooth Device
7	Comment[bg]=Компютърно/PDA устройство Bluetooth	8	Comment[bg]=Компютърно/PDA устройство Bluetooth
8	Comment[bs]=Računar/PDA Bluetooth uređaj	9	Comment[bs]=Računar/PDA Bluetooth uređaj

Lines 3-8 Link Here

(-)kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/misc-device-class.desktop (+1 lines)
3	Type=MimeType	3	Type=MimeType
4	MimeType=bluetooth/misc-device-class	4	MimeType=bluetooth/misc-device-class
5	Icon=kdebluetooth	5	Icon=kdebluetooth
		6	X-KDE-IsAlso=inode/directory
6	Comment=Miscellaneous Bluetooth Device	7	Comment=Miscellaneous Bluetooth Device
7	Comment[bg]=Разни устройства Bluetooth	8	Comment[bg]=Разни устройства Bluetooth
8	Comment[da]=Diverse Bluetooth-enheder	9	Comment[da]=Diverse Bluetooth-enheder

Lines 3-8 Link Here

(-)kdebluetooth-1.0_beta1.old/kdebluetooth/kdebluetooth-common/mimetypes/phone-device-class.desktop (+1 lines)
3	Type=MimeType	3	Type=MimeType
4	MimeType=bluetooth/phone-device-class	4	MimeType=bluetooth/phone-device-class
5	Icon=kaddressbook	5	Icon=kaddressbook
		6	X-KDE-IsAlso=inode/directory
6	Comment=Phone Bluetooth Device	7	Comment=Phone Bluetooth Device
7	Comment[bg]=Телефонно устройство Bluetooth	8	Comment[bg]=Телефонно устройство Bluetooth
8	Comment[da]=Telefon Bluetooth-enhed	9	Comment[da]=Telefon Bluetooth-enhed

Lines 4-9 Link Here

(-)kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/bluetooth.protocol (+1 lines)
4	input=none	4	input=none
5	output=filesystem	5	output=filesystem
6	reading=true	6	reading=true
		7	listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
7	Icon=kdebluetooth	8	Icon=kdebluetooth
8	Description=Bluetooth inquiry protocol	9	Description=Bluetooth inquiry protocol
9	Description[da]=Bluetooth forespørgselsprotokol	10	Description[da]=Bluetooth forespørgselsprotokol

Lines 64-69 Link Here

(-)kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/bluetooth/kiobluetooth.cpp (-1 / +3 lines)
64	if (url.hasHost() == false && path == "/")	64	if (url.hasHost() == false && path == "/")
65	{	65	{
66	createDirEntry(entry, "Bluetooth neighbourhood");	66	createDirEntry(entry, "Bluetooth neighbourhood");
		67	statEntry(entry);
67	finished();	68	finished();
68	}	69	}
69	else {	70	else {
Lines 284-290 Link Here
284		285
285	addAtom(entry, UDS_MIME_TYPE, mimeType);	286	addAtom(entry, UDS_MIME_TYPE, mimeType);
286	addAtom(entry, UDS_FILE_TYPE, S_IFDIR);	287	addAtom(entry, UDS_FILE_TYPE, S_IFDIR);
287	addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder");	288	// No more necessary
		289	// addAtom(entry, UDS_GUESSED_MIME_TYPE, "inode/folder");
288		290
289	return true;	291	return true;
290	}	292	}




        if (path == "/")
        {
            createDirEntry(entry, "Bluetooth neighbourhood");
            statEntry(entry);
            finished();
        }
        else
        {
            QRegExp reg = QRegExp("^/uuid-(0x[a-f,A-F,0-9:]+)/");
            if (reg.search(path) >= 0) {
                createDirEntry(entry, "More services");
                statEntry(entry);
                finished();
            }
            else {
            	error(KIO::ERR_SLAVE_DEFINED,
                  i18n("Could not stat %1. Unknown device").arg(url.url()));
            }
        }
    }
    else {

Lines 5-10 Link Here

(-)kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.protocol (+1 lines)
5	output=filesystem	5	output=filesystem
6	reading=true	6	reading=true
7	Icon=kdebluetooth	7	Icon=kdebluetooth
		8	listing=Name,Type,Size,Date,AccessDate,Access,Owner,Group,Link
8	Description=Bluetooth service discovery protocol	9	Description=Bluetooth service discovery protocol
9	Description[da]=Bluetooth-protokol til opdagelse af serviceydelser	10	Description[da]=Bluetooth-protokol til opdagelse af serviceydelser
10	Description[et]=Bluetoothi teenuste avastamise protokoll	11	Description[et]=Bluetoothi teenuste avastamise protokoll

Return to bug 129237

Lines 131-142 Link Here

(-)kdebluetooth-1.0_beta1.old/kdebluetooth/kioslave/sdp/btsdp.cpp (-1 / +10 lines)
131	if (path == "/")	131	if (path == "/")
132	{	132	{
133	createDirEntry(entry, "Bluetooth neighbourhood");	133	createDirEntry(entry, "Bluetooth neighbourhood");
		134	statEntry(entry);
134	finished();	135	finished();
135	}	136	}
136	else	137	else
137	{	138	{
138	error(KIO::ERR_SLAVE_DEFINED,	139	QRegExp reg = QRegExp("^/uuid-(0x[a-f,A-F,0-9:]+)/");
		140	if (reg.search(path) >= 0) {
		141	createDirEntry(entry, "More services");
		142	statEntry(entry);
		143	finished();
		144	}
		145	else {
		146	error(KIO::ERR_SLAVE_DEFINED,
139	i18n("Could not stat %1. Unknown device").arg(url.url()));	147	i18n("Could not stat %1. Unknown device").arg(url.url()));
		148	}
140	}	149	}
141	}	150	}
142	else {	151	else {