From a5c2457fa8bc8afcb56f6629e6f254620cca380e Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Mon, 8 Feb 2010 00:36:25 +0000 Subject: [PATCH] Re-add dev_t version of FSGetDeskDir for bin compat reasons: BeIDE (unfortunately) appears to make use of some of the private FSUtils calls. Reimplemented call to use the normal FSGetDeskDir ignoring the passed in volume argument since we no longer have a desktop directory any place else. Fixes the problem reported in #5135. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35428 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/tracker/FSUtils.cpp | 11 +++++++++++ src/kits/tracker/FSUtils.h | 2 ++ 2 files changed, 13 insertions(+) diff --git a/src/kits/tracker/FSUtils.cpp b/src/kits/tracker/FSUtils.cpp index 35082115ab..df3ecdbbc5 100644 --- a/src/kits/tracker/FSUtils.cpp +++ b/src/kits/tracker/FSUtils.cpp @@ -2375,6 +2375,17 @@ FSGetTrashDir(BDirectory *trashDir, dev_t dev) } +// obsolete version of FSGetDeskDir retained for bin compat with +// BeIDE and a few other apps that apparently use it +status_t +FSGetDeskDir(BDirectory *deskDir, dev_t) +{ + // since we no longer keep a desktop directory on any volume other + // than /boot, redirect to FSGetDeskDir ignoring the volume argument + return FSGetDeskDir(deskDir); +} + + status_t FSGetDeskDir(BDirectory *deskDir) { diff --git a/src/kits/tracker/FSUtils.h b/src/kits/tracker/FSUtils.h index a52e60ecea..6191535037 100644 --- a/src/kits/tracker/FSUtils.h +++ b/src/kits/tracker/FSUtils.h @@ -195,6 +195,8 @@ _IMPEXP_TRACKER status_t FSCreateNewFolderIn(const node_ref *destDir, entry_ref node_ref *new_node); _IMPEXP_TRACKER void FSCreateTrashDirs(); _IMPEXP_TRACKER status_t FSGetTrashDir(BDirectory *trashDir, dev_t volume); +// obsolete version of FSGetDeskDir kept for binary compat reasons +_IMPEXP_TRACKER status_t FSGetDeskDir(BDirectory *deskDir, dev_t volume); _IMPEXP_TRACKER status_t FSGetDeskDir(BDirectory *deskDir); _IMPEXP_TRACKER status_t FSRecursiveCalcSize(BInfoWindow *, CopyLoopControl* loopControl, BDirectory *, off_t *runningSize,