Changeset 183 for trunk/desktop/class_c/wpfilesystem.c

Timestamp:

Jan 7, 2007, 10:36:52 PM (19 years ago)

Author:

cinc

Message:

New methods and additions all over the place.

File:

• trunk/desktop/class_c/wpfilesystem.c (modified) (2 diffs)

trunk/desktop/class_c/wpfilesystem.c

@@ -43 +43 @@
 
 #include <string.h>
+#include "gtk/gtk.h"
+/* Gui stuff */
+#include "nomguitk.h"
+#include "nomwindow.h"
+#include "desktoptypes.h"
+
+#include "nomfolderwindow.h"
+
+
 #include "wpfilesystem.ih"
 
@@ -54 +63 @@
 }
 
-NOM_Scope PNOMPath NOMLINK impl_WPFileSystem_wpQueryRealName(WPFileSystem* nomSelf, const CORBA_boolean bFullPath,
+NOM_Scope PNOMPath NOMLINK impl_WPFileSystem_wpQueryFileName(WPFileSystem* nomSelf, const CORBA_boolean bFullPath,
                                                              CORBA_Environment *ev)
 {
   WPFileSystemData* nomThis=WPFileSystemGetData(nomSelf);
-  PNOMPath nomRetval=NOMPathNew();
-  
-  NOMPath_assignCString(nomRetval, _pszFullPath, ev);
+  PNOMPath nomRetval;
+  PNOMPath nomPath;
+  PWPFolder wpParent;
 
-  return nomRetval;
+  if(!bFullPath){
+    nomRetval=NOMPathNew();
+    return (PNOMPath) NOMPath_assignCString(nomRetval, _pszFullPath, ev);
+  }
+
+  /* we are interested in the full path */
+
+  /* Get parent folder */
+  wpParent=WPFileSystem_wpQueryFolder(nomSelf, NULLHANDLE);
+
+  if(NULLHANDLE==wpParent)
+    {
+      /* We are root folder */
+      nomRetval=NOMPathNew();
+      return (PNOMPath) NOMPath_assignCString(nomRetval, _pszFullPath, ev);
+    }
+
+  /* We area folder somwhere in the chain */
+  nomRetval=WPFileSystem_wpQueryFileName((WPFileSystem*)wpParent, bFullPath, NULLHANDLE);
+  nomPath=NOMPathNew();
+  nomPath= (PNOMPath) NOMPath_assignCString(nomPath, _pszFullPath, ev);
+
+  return (PNOMPath)NOMPath_appendPath(nomRetval, nomPath, NULLHANDLE);
 }