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.

[patch] Updated patch for R14 to fix ShowOnlyIn/NotShowIn

tdelibs-ShowIn-2.diff (text/plain), 4.22 KB, created by Darrell on 2013-04-22 16:49:47 CDT

(hide)

Description: Updated patch for R14 to fix ShowOnlyIn/NotShowIn

Filename:

MIME Type:

Creator: Darrell

Created: 2013-04-22 16:49:47 CDT

Size: 4.22 KB

patch

obsolete

>diff -urN tdelibs/CMakeLists.txt tdelibs.new/CMakeLists.txt >--- tdelibs/CMakeLists.txt 2013-04-18 19:22:18.000000000 -0500 >+++ tdelibs.new/CMakeLists.txt 2013-04-22 15:26:48.350516196 -0500 >@@ -88,6 +88,7 @@ > option( WITH_UDISKS2 "Enable UDISKS2 support" ${WITH_ALL_OPTIONS} ) > OPTION( WITH_NETWORK_MANAGER_BACKEND "Enable network-manager support" OFF ) > OPTION( WITH_SUDO_TDESU_BACKEND "Use sudo as backend for tdesu (default is su)" OFF ) >+OPTION( WITH_OLD_XDG_STD "Use the pre R14.0.0 XDG standard where both TDE and KDE are recognized in desktop files" OFF ) > > OPTION( WITH_ASPELL "Enable aspell support" ${WITH_ALL_OPTIONS} ) > OPTION( WITH_HSPELL "Enable hspell support" ${WITH_ALL_OPTIONS} ) >diff -urN tdelibs/config.h.cmake tdelibs.new/config.h.cmake >--- tdelibs/config.h.cmake 2013-04-18 19:22:18.000000000 -0500 >+++ tdelibs.new/config.h.cmake 2013-04-22 15:40:34.620672885 -0500 >@@ -834,6 +834,9 @@ > /* Defined if compiling with the network-manager backend */ > #cmakedefine WITH_NETWORK_MANAGER_BACKEND 1 > >+/* Defined if compiling with old XDG standard support */ >+#cmakedefine WITH_OLD_XDG_STD 1 >+ > /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most > significant byte first (like Motorola and SPARC, unlike Intel). */ > #if defined AC_APPLE_UNIVERSAL_BUILD >diff -urN tdelibs/kinit/autostart.cpp tdelibs.new/kinit/autostart.cpp >--- tdelibs/kinit/autostart.cpp 2013-03-02 15:57:35.000000000 -0600 >+++ tdelibs.new/kinit/autostart.cpp 2013-04-22 15:55:45.221228984 -0500 >@@ -178,13 +178,23 @@ > > if (config.hasKey("OnlyShowIn")) > { >+#ifdef WITH_OLD_XDG_STD > if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))) > continue; >+#else >+ if (!config.readListEntry("OnlyShowIn", ';').contains("TDE")) >+ continue; >+#endif > } > if (config.hasKey("NotShowIn")) > { >+#ifdef WITH_OLD_XDG_STD > if ((config.readListEntry("NotShowIn", ';').contains("TDE")) || (config.readListEntry("NotShowIn", ';').contains("KDE"))) > continue; >+#else >+ if (config.readListEntry("NotShowIn", ';').contains("TDE")) >+ continue; >+#endif > } > > AutoStartItem *item = new AutoStartItem; >diff -urN tdelibs/tdeio/tdeio/kservice.cpp tdelibs.new/tdeio/tdeio/kservice.cpp >--- tdelibs/tdeio/tdeio/kservice.cpp 2013-04-06 16:24:02.000000000 -0500 >+++ tdelibs.new/tdeio/tdeio/kservice.cpp 2013-04-22 15:57:58.208441055 -0500 >@@ -749,8 +749,13 @@ > { > TQString aValue = it.data().toString(); > TQStringList aList = TQStringList::split(';', aValue); >+#ifdef WITH_OLD_XDG_STD > if ((!aList.contains("TDE")) && (!aList.contains("KDE"))) > return true; >+#else >+ if (!aList.contains("TDE")) >+ return true; >+#endif > } > > it = m_mapProps.find( "NotShowIn" ); >@@ -758,8 +763,13 @@ > { > TQString aValue = it.data().toString(); > TQStringList aList = TQStringList::split(';', aValue); >+#ifdef WITH_OLD_XDG_STD > if ((aList.contains("TDE")) || (aList.contains("KDE"))) > return true; >+#else >+ if (aList.contains("TDE")) >+ return true; >+#endif > } > > if (!kapp->authorizeControlModule(d->menuId)) >diff -urN tdelibs/tdeio/tdeio/kservicegroup.cpp tdelibs.new/tdeio/tdeio/kservicegroup.cpp >--- tdelibs/tdeio/tdeio/kservicegroup.cpp 2013-03-02 15:57:35.000000000 -0600 >+++ tdelibs.new/tdeio/tdeio/kservicegroup.cpp 2013-04-22 15:59:57.658734605 -0500 >@@ -84,13 +84,23 @@ > TQStringList tmpList; > if (config.hasKey("OnlyShowIn")) > { >+#ifdef WITH_OLD_XDG_STD > if ((!config.readListEntry("OnlyShowIn", ';').contains("TDE")) && (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))) > d->m_bNoDisplay = true; >+#else >+ if (!config.readListEntry("OnlyShowIn", ';').contains("TDE")) >+ d->m_bNoDisplay = true; >+#endif > } > if (config.hasKey("NotShowIn")) > { >+#ifdef WITH_OLD_XDG_STD > if ((config.readListEntry("NotShowIn", ';').contains("TDE")) || (config.readListEntry("NotShowIn", ';').contains("KDE"))) > d->m_bNoDisplay = true; >+#else >+ if (config.readListEntry("NotShowIn", ';').contains("TDE")) >+ d->m_bNoDisplay = true; >+#endif > } > > m_strBaseGroupName = config.readEntry( "X-TDE-BaseGroup" ); View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]