The CORBA setup actually works properly now :-)

gnome/ChangeLog

@@ -1,3 +1,10 @@
+1998-12-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
+
+	* gmain.c (create_panels): Register corba server here.
+
+	* gcorba.c: Fix a servant declaration to point to the correct
+	vepv. 
+
 1998-12-30  Federico Mena Quintero  <federico@nuclecu.unam.mx>
 
 	* gdesktop.c (find_icon_by_drag_context): Made static.

gnome/gcorba.c

@@ -107,7 +107,7 @@ static POA_GNOME_FileManagerFactory__vepv impl_GNOME_FileManagerFactory_vepv =
 
 impl_POA_GNOME_FileManagerFactory poa_filemanagerfactory_servant =
 {
-	{ NULL, &impl_GNOME_FileManagerWindow_vepv}, NULL
+	{ NULL, &impl_GNOME_FileManagerFactory_vepv}, NULL
 };
 
 GNOME_FileManagerFactory filemanagerfactory_server;
@@ -239,7 +239,7 @@ corba_register_server (void)
 	
 	v = goad_server_register (
 		NULL, filemanagerfactory_server,
-		"gmc_FileManagerFactory", "server", &ev);
+		"gmc_filemanager_factory", "server", &ev);
 
 	if (v != 0)
 		return;

gnome/gmain.c

@@ -539,6 +539,8 @@ create_panels (void)
 	g_list_free (directory_list);
 #endif
 
+	main_corba_register_server ();
+
 	run_dlg (desktop_dlg);
 
 	/* shutdown gnome specific bits of midnight commander */

src/ChangeLog

@@ -1,5 +1,9 @@
 1998-12-30  Miguel de Icaza  <miguel@nuclecu.unam.mx>
 
+	* main.c (main): Removed old, unused code.
+	(setup_panels_and_run_mc): Register the corba server here, not
+	before, as the program is not ready to accept any commands yet. 
+
 	* screen.c (panel_set_sort_order): New routine to set the sorting
 	mode.  
 	(panel_re_sort): New routine to force a resort on a panel.

src/main.c

@@ -2652,6 +2652,14 @@ static struct poptOption argument_table [] = {
     { NULL, 		0,			0, NULL, 0 }
 };
 
+void
+main_corba_register_server (void)
+{
+#ifdef HAVE_CORBA
+	corba_register_server ();
+#endif
+}
+
 static void
 handle_args (int argc, char *argv [])
 {
@@ -2668,7 +2676,6 @@ handle_args (int argc, char *argv [])
     orb = gnome_CORBA_init_with_popt_table (
 	    "gmc", VERSION, &argc, argv, argument_table, 0, &ctx, GNORBA_INIT_SERVER_FUNC, &ev);
 
-    corba_register_server ();
 #else
     gnome_init_with_popt_table ("gmc", VERSION, argc, argv, argument_table, 0, &ctx);
 #endif
@@ -2798,16 +2805,12 @@ compatibility_move_mc_files (void)
 
 int main (int argc, char *argv [])
 {
-#ifndef OS2_NT
-    /* Backward compatibility: Gives up privileges in case someone
-       installed the mc as setuid */
-    setuid (getuid ());
-#endif
     /* We had LC_CTYPE before, LC_ALL includs LC_TYPE as well */
     setlocale (LC_ALL, "");
     bindtextdomain ("mc", LOCALEDIR);
     textdomain ("mc");
 
+    /* This is here to debug the CORBA async invocations */
     {
 	    volatile  int i = 1;
 
@@ -2820,6 +2823,13 @@ int main (int argc, char *argv [])
     
     OS_Setup ();
 
+    /* This variable is used by the subshell */
+    home_dir = getenv ("HOME");
+    if (!home_dir) {
+	    /* mc_home was computed by OS_Setup */
+	    home_dir = mc_home; 
+    }
+
     vfs_init ();
 
 #ifdef HAVE_X
@@ -2904,16 +2914,6 @@ int main (int argc, char *argv [])
     /* Install the SIGCHLD handler; must be done before init_subshell() */
     init_sigchld ();
     
-    /* This variable is used by the subshell */
-    home_dir = getenv ("HOME");
-    if (!home_dir) {
-#ifndef OS2_NT
-    home_dir = PATH_SEP_STR;
-#else
-    home_dir = mc_home; /* LIBDIR, calculated in OS_Setup() */
-#endif
-    }
-
     compatibility_move_mc_files ();
     
 #   ifdef HAVE_X