Attachment #1223 for bug #1493

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 1493
Collapse All | Expand All

Lines 22-28 link_directories( Link Here

(-)a/kioslave/filter/CMakeLists.txt (-1 / +1 lines)
22		22
23	##### other data ################################	23	##### other data ################################
24		24
25	install( FILES gzip.protocol bzip.protocol bzip2.protocol DESTINATION ${SERVICES_INSTALL_DIR} )	25	install( FILES gzip.protocol bzip.protocol bzip2.protocol xz.protocol lzma.protocol DESTINATION ${SERVICES_INSTALL_DIR} )
26		26
27		27
28	##### kio_filter (module) #######################	28	##### kio_filter (module) #######################

Lines 16-21 protocoldir = $(kde_servicesdir) Link Here

(-)a/kioslave/filter/Makefile.am (-1 / +7 lines)
16	if include_BZIP2	16	if include_BZIP2
17	BZIP2FILES=bzip.protocol bzip2.protocol	17	BZIP2FILES=bzip.protocol bzip2.protocol
18	endif	18	endif
		19	if include_XZ
		20	XZPROTOCOL=xz.protocol
		21	endif
		22	if include_LZMA
		23	LZMAPROTOCOL=lzma.protocol
		24	endif
19		25
20	protocol_DATA = gzip.protocol $(BZIP2FILES)	26	protocol_DATA = gzip.protocol $(BZIP2FILES) $(XZPROTOCOL) $(LZMAPROTOCOL)
21		27

Line 0 Link Here

(-)a/kioslave/filter/lzma.protocol (+10 lines)
	1	[Protocol]
	2	exec=kio_filter
	3	protocol=lzma
	4	mimetype=application/x-lzma
	5	input=stream
	6	output=stream
	7	reading=true
	8	source=false
	9	DocPath=kioslave/lzma.html
	10	Icon=ark

Line 0 Link Here

(-)a/kioslave/filter/xz.protocol (+10 lines)
	1	[Protocol]
	2	exec=kio_filter
	3	protocol=xz
	4	mimetype=application/x-xz
	5	input=stream
	6	output=stream
	7	reading=true
	8	source=false
	9	DocPath=kioslave/xz.html
	10	Icon=ark

Lines 70-75 void stripExtension( TQString *name ) Link Here

(-)a/kioslave/man/kio_man.cpp (-6 / +22 lines)
70	pos -= 4;	70	pos -= 4;
71	else if ( name->find(".bz", -3) != -1 )	71	else if ( name->find(".bz", -3) != -1 )
72	pos -= 3;	72	pos -= 3;
		73	else if ( name->find(".xz", -3) != -1 )
		74	pos -= 3;
		75	else if ( name->find(".lzma", -5) != -1 )
		76	pos -= 5;
73		77
74	if ( pos > 0 )	78	if ( pos > 0 )
75	pos = name->findRev('.', pos-1);	79	pos = name->findRev('.', pos-1);
Lines 476-488 void MANProtocol::get(const KURL& url ) Link Here
476	{	480	{
477	pageFound=false;	481	pageFound=false;
478	//check for the case that there is foo.1 and foo.1.gz found:	482	//check for the case that there is foo.1 and foo.1.gz found:
479	// ### TODO make it more generic (other extensions)	483	if (foundPages.count()==2) {
480	if ((foundPages.count()==2) &&	484	TQString foundPage0 = foundPages[0];
481	(((foundPages[0]+".gz") == foundPages[1]) \|\|	485	TQString foundPage1 = foundPages[1];
482	(foundPages[0] == (foundPages[1]+".gz"))))	486
483	pageFound=true;	487	stripExtension(&foundPage0);
484	else	488	stripExtension(&foundPage1);
		489	if(foundPage0 == foundPage1) {
		490	pageFound=true;
		491	}
		492	}
		493	if (!pageFound) {
485	outputMatchingPages(foundPages);	494	outputMatchingPages(foundPages);
		495	}
486	}	496	}
487	//yes, we found exactly one man page	497	//yes, we found exactly one man page
488		498
Lines 1335-1340 void MANProtocol::showIndex(const TQString& section) Link Here
1335	end -= 2;	1345	end -= 2;
1336	else if ( len >= 4 && strcmp( end-3, ".bz2" ) == 0 )	1346	else if ( len >= 4 && strcmp( end-3, ".bz2" ) == 0 )
1337	end -= 4;	1347	end -= 4;
		1348	else if ( len >= 3 && strcmp( end-2, ".bz" ) == 0 )
		1349	end -= 3;
		1350	else if ( len >= 3 && strcmp( end-2, ".xz" ) == 0 )
		1351	end -= 3;
		1352	else if ( len >= 5 && strcmp( end-4, ".lzma" ) == 0 )
		1353	end -= 5;
1338		1354
1339	while ( end >= begin && *end != '.' )	1355	while ( end >= begin && *end != '.' )
1340	end--;	1356	end--;

Return to bug 1493