[haiku-commits] r35428 - haiku/trunk/src/kits/tracker

From: anevilyak@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Mon, 8 Feb 2010 01:36:26 +0100 (CET)
Author: anevilyak
Date: 2010-02-08 01:36:25 +0100 (Mon, 08 Feb 2010)
New Revision: 35428
Changeset: http://dev.haiku-os.org/changeset/35428/haiku
Ticket: http://dev.haiku-os.org/ticket/5135

Modified:
   haiku/trunk/src/kits/tracker/FSUtils.cpp
   haiku/trunk/src/kits/tracker/FSUtils.h
Log:
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.


Modified: haiku/trunk/src/kits/tracker/FSUtils.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.cpp    2010-02-07 18:47:37 UTC (rev 
35427)
+++ haiku/trunk/src/kits/tracker/FSUtils.cpp    2010-02-08 00:36:25 UTC (rev 
35428)
@@ -2375,7 +2375,18 @@
 }
 
 
+// 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)
 {
        BPath path;

Modified: haiku/trunk/src/kits/tracker/FSUtils.h
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.h      2010-02-07 18:47:37 UTC (rev 
35427)
+++ haiku/trunk/src/kits/tracker/FSUtils.h      2010-02-08 00:36:25 UTC (rev 
35428)
@@ -195,6 +195,8 @@
        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,
[haiku-commits] r35428 - haiku/trunk/src/kits/tracker

Other related posts:
