summaryrefslogtreecommitdiffstats
path: root/opensuse/tdelibs/autostart-spec.diff
diff options
context:
space:
mode:
authorRobert Xu <robxu9@gmail.com>2011-11-10 18:04:39 -0500
committerRobert Xu <robxu9@gmail.com>2011-11-10 18:04:39 -0500
commit21fcfa3348213aa87f0e3aef62ca4720c6d31cb7 (patch)
tree2cfb64c59322628e613ed0895e3c3694d3abe6bd /opensuse/tdelibs/autostart-spec.diff
parent8667643bff14a60d8571c599efd3e48bed3e3b12 (diff)
downloadtde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.tar.gz
tde-packaging-21fcfa3348213aa87f0e3aef62ca4720c6d31cb7.zip
initial commit to suse branch: eclipse integration
Diffstat (limited to 'opensuse/tdelibs/autostart-spec.diff')
-rw-r--r--opensuse/tdelibs/autostart-spec.diff55
1 files changed, 0 insertions, 55 deletions
diff --git a/opensuse/tdelibs/autostart-spec.diff b/opensuse/tdelibs/autostart-spec.diff
deleted file mode 100644
index a67a8e487..000000000
--- a/opensuse/tdelibs/autostart-spec.diff
+++ /dev/null
@@ -1,55 +0,0 @@
-Index: kdecore/kstandarddirs.cpp
-===================================================================
---- kdecore/kstandarddirs.cpp.orig
-+++ kdecore/kstandarddirs.cpp
-@@ -100,7 +100,7 @@ static const char* const types[] = {"htm
- "wallpaper", "lib", "pixmap", "templates",
- "module", "qtplugins",
- "xdgdata-apps", "xdgdata-dirs", "xdgconf-menu",
-- "xdgdata-icon", "xdgdata-pixmap",
-+ "xdgdata-icon", "xdgdata-pixmap", "xdgconf-autostart",
- "kcfg", "emoticons", 0 };
-
- static int tokenize( QStringList& token, const QString& str,
-@@ -1067,6 +1067,8 @@ QString KStandardDirs::kde_default(const
- return "desktop-directories/";
- if (!strcmp(type, "xdgconf-menu"))
- return "menus/";
-+ if (!strcmp(type, "xdgconf-autostart"))
-+ return "autostart/";
- if (!strcmp(type, "kcfg"))
- return "share/config.kcfg";
- if (!strcmp(type, "emoticons"))
-Index: kinit/autostart.cpp
-===================================================================
---- kinit/autostart.cpp.orig
-+++ kinit/autostart.cpp
-@@ -104,7 +104,9 @@ static bool startCondition(const QString
- void
- AutoStart::loadAutoStartList()
- {
-- QStringList files = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
-+ QStringList files = KGlobal::dirs()->findAllResources("xdgconf-autostart", "*.desktop", false, true);
-+ QStringList kdefiles = KGlobal::dirs()->findAllResources("autostart", "*.desktop", false, true);
-+ files += kdefiles;
-
- for(QStringList::ConstIterator it = files.begin();
- it != files.end();
-@@ -129,6 +131,17 @@ AutoStart::loadAutoStartList()
- continue;
- }
-
-+ if (config.hasKey("OnlyShowIn"))
-+ {
-+ if (!config.readListEntry("OnlyShowIn", ';').contains("KDE"))
-+ continue;
-+ }
-+ if (config.hasKey("NotShowIn"))
-+ {
-+ if (config.readListEntry("NotShowIn", ';').contains("KDE"))
-+ continue;
-+ }
-+
- AutoStartItem *item = new AutoStartItem;
- item->name = extractName(*it);
- item->service = *it;