Changeset 258 for trunk/desktop/src/vdesktop.c

Timestamp:

Mar 17, 2007, 11:42:55 AM (18 years ago)

Author:

cinc

Message:

New WPDrives and WPRootFolder classes. Some minor changes.

File:

• trunk/desktop/src/vdesktop.c (modified) (7 diffs)

trunk/desktop/src/vdesktop.c

@@ -57 +57 @@
 #include "m_wpfolder.h"
 #include "wpfolder.h"
+#include "m_wprootfolder.h"
+#include "wprootfolder.h"
 #include "wpobject.h"
 
@@ -87 +89 @@
   PNOM_ENV pEnv;
   NOMClassMgr *NOMClassMgrObject;
-  GtkWidget* window;
-  int a;
-  ULONG pMem;
   HREGDLL hReg=NULLHANDLE;
   
@@ -99 +98 @@
   gchar *chrDisplayName;
 
+  /* Register DLLs with the garbage collector */
   hReg=nomBeginRegisterDLLWithGC();
   if(NULLHANDLE==hReg)
     return 1;
   
-  /* Register DLLs with the garbage collector */
   g_assert(nomRegisterDLLByName(hReg, "GLIB2.DLL" ));
   g_assert(nomRegisterDLLByName(hReg, "GOBJECT2.DLL"));
@@ -125 +124 @@
 
 #if 0
-  /* Initialize thread subsystem */
+  /* Initialize thread subsystem. This needs a multithreaded glib */
   if(!g_thread_supported())
     g_thread_init(NULL);
@@ -161 +160 @@
   /* Create root folder */
   np=NOMPath_queryPathBegin(nomPath, NULLHANDLE);
-  wpRootFolder=WPFolderNew();
-  WPFolder_wpLockObject(wpRootFolder, NULLHANDLE);
-  WPFolder_tstSetFullPath(wpRootFolder, NOMPath_queryCString(NOMPath_queryRoot(np, NULLHANDLE),NULLHANDLE),
+  wpRootFolder=WPRootFolderNew();
+  WPRootFolder_wpLockObject(wpRootFolder, NULLHANDLE);
+  WPRootFolder_tstSetFullPath(wpRootFolder, NOMPath_queryCString(NOMPath_queryRoot(np, NULLHANDLE),NULLHANDLE),
                           NULLHANDLE);
   chrDisplayName = g_filename_to_utf8 (NOMPath_queryCString(np,NULLHANDLE), -1, NULL, NULL, NULL);
-  WPFolder_wpSetTitleFromCString((WPObject*)wpRootFolder, chrDisplayName, NULLHANDLE);
+  WPRootFolder_wpSetTitleFromCString((WPObject*)wpRootFolder, chrDisplayName, NULLHANDLE);
 
   wpTempFolder=wpRootFolder;
@@ -188 +187 @@
       /* insert into contents list */
       WPFolder_wpAddToContent(wpTempFolder, (WPObject*) wpFolder, 
-                              NOMPath_copyCString(np, NULLHANDLE), NULLHANDLE);
+                              NULLHANDLE);
       
       wpTempFolder=wpFolder;
@@ -215 +214 @@
 
     
-#if 0
-    mem=g_malloc(1250000);
-    memset(mem, 0xaa, 10000);
-    //  *pGlobalMemInExe=mem;
-    for(a=0;a<50;a++){
-      g_malloc(1250000);
-      printf("%x %x %x %x %d\n", *mem, *(mem+1), *(mem+2), *(mem+3), 0);
-      //printf("%x\n", *((ULONG*)pGlobalMemInExe));
-    }
-#endif
-
+#warning !!!!! A call to NOMTerminate() or alike is missing 
     printf("And now we quit...\n");