Attachment #1179 for bug #1364

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

Lines 88-93 Link Here

(-)tdelibs/CMakeLists.txt (+1 lines)
88	option( WITH_UDISKS2 "Enable UDISKS2 support" ${WITH_ALL_OPTIONS} )	88	option( WITH_UDISKS2 "Enable UDISKS2 support" ${WITH_ALL_OPTIONS} )
89	OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )	89	OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF )
90	OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF )	90	OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF )
		91	OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF )
91		92
92	OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )	93	OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} )
93	OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )	94	OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} )

Lines 834-839 Link Here

(-)tdelibs/config.h.cmake (+3 lines)
834	/* Defined if compiling with the network-manager backend */	834	/* Defined if compiling with the network-manager backend */
835	#cmakedefine WITH_NETWORK_MANAGER_BACKEND 1	835	#cmakedefine WITH_NETWORK_MANAGER_BACKEND 1
836		836
		837	/* Defined if compiling with old XDG standard support */
		838	#cmakedefine WITH_OLD_XDG_STD 1
		839
837	/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most	840	/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
838	significant byte first (like Motorola and SPARC, unlike Intel). */	841	significant byte first (like Motorola and SPARC, unlike Intel). */
839	#if defined AC_APPLE_UNIVERSAL_BUILD	842	#if defined AC_APPLE_UNIVERSAL_BUILD

Lines 178-190 Link Here

(-)tdelibs/kinit/autostart.cpp (+10 lines)
178		178
179	if (config.hasKey("OnlyShowIn"))	179	if (config.hasKey("OnlyShowIn"))
180	{	180	{
		181	#ifdef WITH_OLD_XDG_STD
181	if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))	182	if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))
182	continue;	183	continue;
		184	#else
		185	if (!config.readListEntry("OnlyShowIn", ';').contains("TDE"))
		186	continue;
		187	#endif
183	}	188	}
184	if (config.hasKey("NotShowIn"))	189	if (config.hasKey("NotShowIn"))
185	{	190	{
		191	#ifdef WITH_OLD_XDG_STD
186	if ((config.readListEntry("NotShowIn", ';').contains("TDE")) \|\| (config.readListEntry("NotShowIn", ';').contains("KDE")))	192	if ((config.readListEntry("NotShowIn", ';').contains("TDE")) \|\| (config.readListEntry("NotShowIn", ';').contains("KDE")))
187	continue;	193	continue;
		194	#else
		195	if (config.readListEntry("NotShowIn", ';').contains("TDE"))
		196	continue;
		197	#endif
188	}	198	}
189		199
190	AutoStartItem *item = new AutoStartItem;	200	AutoStartItem *item = new AutoStartItem;

Lines 749-756 Link Here

(-)tdelibs/tdeio/tdeio/kservice.cpp (+10 lines)
749	{	749	{
750	TQString aValue = it.data().toString();	750	TQString aValue = it.data().toString();
751	TQStringList aList = TQStringList::split(';', aValue);	751	TQStringList aList = TQStringList::split(';', aValue);
		752	#ifdef WITH_OLD_XDG_STD
752	if ((!aList.contains("TDE")) && (!aList.contains("KDE")))	753	if ((!aList.contains("TDE")) && (!aList.contains("KDE")))
753	return true;	754	return true;
		755	#else
		756	if (!aList.contains("TDE"))
		757	return true;
		758	#endif
754	}	759	}
755		760
756	it = m_mapProps.find( "NotShowIn" );	761	it = m_mapProps.find( "NotShowIn" );
Lines 758-765 Link Here
758	{	763	{
759	TQString aValue = it.data().toString();	764	TQString aValue = it.data().toString();
760	TQStringList aList = TQStringList::split(';', aValue);	765	TQStringList aList = TQStringList::split(';', aValue);
		766	#ifdef WITH_OLD_XDG_STD
761	if ((aList.contains("TDE")) \|\| (aList.contains("KDE")))	767	if ((aList.contains("TDE")) \|\| (aList.contains("KDE")))
762	return true;	768	return true;
		769	#else
		770	if (aList.contains("TDE"))
		771	return true;
		772	#endif
763	}	773	}
764		774
765	if (!kapp->authorizeControlModule(d->menuId))	775	if (!kapp->authorizeControlModule(d->menuId))

Lines 84-96 Link Here

(-)tdelibs/tdeio/tdeio/kservicegroup.cpp (+10 lines)
84	TQStringList tmpList;	84	TQStringList tmpList;
85	if (config.hasKey("OnlyShowIn"))	85	if (config.hasKey("OnlyShowIn"))
86	{	86	{
		87	#ifdef WITH_OLD_XDG_STD
87	if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))	88	if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE")))
88	d->m_bNoDisplay = true;	89	d->m_bNoDisplay = true;
		90	#else
		91	if (!config.readListEntry("OnlyShowIn", ';').contains("TDE"))
		92	d->m_bNoDisplay = true;
		93	#endif
89	}	94	}
90	if (config.hasKey("NotShowIn"))	95	if (config.hasKey("NotShowIn"))
91	{	96	{
		97	#ifdef WITH_OLD_XDG_STD
92	if ((config.readListEntry("NotShowIn", ';').contains("TDE")) \|\| (config.readListEntry("NotShowIn", ';').contains("KDE")))	98	if ((config.readListEntry("NotShowIn", ';').contains("TDE")) \|\| (config.readListEntry("NotShowIn", ';').contains("KDE")))
93	d->m_bNoDisplay = true;	99	d->m_bNoDisplay = true;
		100	#else
		101	if (config.readListEntry("NotShowIn", ';').contains("TDE"))
		102	d->m_bNoDisplay = true;
		103	#endif
94	}	104	}
95		105
96	m_strBaseGroupName = config.readEntry( "X-TDE-BaseGroup" );	106	m_strBaseGroupName = config.readEntry( "X-TDE-BaseGroup" );

Return to bug 1364