1 files changed, 11 insertions, 70 deletions

diff --git a/mixgtk/mixgtk.c b/mixgtk/mixgtk.c
index 97f6a16..8526390 100644
--- a/mixgtk/mixgtk.c
+++ b/mixgtk/mixgtk.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk.c :
  * Main functions of the mix gtk front-end
  * ------------------------------------------------------------------
- * $Id: mixgtk.c,v 1.17 2004/06/24 01:40:48 jao Exp $
+ * $Id: mixgtk.c,v 1.18 2004/06/30 14:07:54 jao Exp $
  * ------------------------------------------------------------------
  * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
  *
@@ -25,102 +25,43 @@
 #include <string.h>
 
 #include "mixgtk_widgets.h"
+
 #include "mixgtk_cmd_dispatcher.h"
-#include "mixgtk_device.h"
-#include "mixgtk_mixvm.h"
-#include "mixgtk_mixal.h"
 #include "mixgtk_input.h"
-#include "mixgtk_fontsel.h"
 #include "mixgtk_config.h"
 #include "mixgtk_wm.h"
 #include "mixgtk.h"
 
-static const gchar *SPLIT_ARG_ = "-s";
-static const gchar *SPLIT_LONG_ARG_ = "--split";
-
+/* initialise the app */
 gboolean
-mixgtk_restart (void)
+mixgtk_init (int argc, char *argv[])
 {
-  mix_vm_t *vm;
-
-  if (!mixgtk_widget_factory_init ())
-    {
-      g_error (_("Unable to initialise application: missing glade file"));
-      return FALSE;
-    }
-
-  if (!mixgtk_cmd_dispatcher_init (MIXGTK_MAIN))
-    {
-      g_error (_("Unable to initialise application (command dispatcher)\n"));
-      return FALSE;
-    }
-
-  vm = mixgtk_cmd_dispatcher_get_vm ();
+  mix_init_lib ();
 
-  if (!mixgtk_mixvm_init (vm, MIXGTK_MIXVM_DIALOG))
-    {
-      g_error (_("Unable to initialise application (mixvm widgets)\n"));
-      return FALSE;
-    }
+  gtk_init (&argc, &argv);
 
-  if (!mixgtk_mixal_init (vm, MIXGTK_MIXAL_DIALOG))
+  if (!mixgtk_config_load ())
     {
-      g_error (_("Unable to initialise application (mixal widgets)\n"));
-      return FALSE;
+      g_error (_("Unable to load gmixvm configuration"));
     }
 
-  if (!mixgtk_device_init (GTK_CONTAINER
-			   (mixgtk_widget_factory_get
-			    (MIXGTK_DEVICES_DIALOG, MIXGTK_WIDGET_DEVICES)),
-			   vm))
+  if (!mixgtk_widget_factory_init ())
     {
-      g_error (_("Unable to initialise application (devices)\n"));
+      g_error (_("Unable to initialise application: missing glade file"));
       return FALSE;
     }
 
   if (!mixgtk_wm_init ())
     {
-      g_error (_("Unable to initialise application (visibility)\n"));
+      g_error (_("Unable to initialise application\n"));
       return FALSE;
     }
 
   mixgtk_input_init ();
 
-  gtk_widget_show (mixgtk_widget_factory_get_dialog (MIXGTK_MAIN));
-  mixgtk_mixvm_update_vm_widgets ();
-
   return TRUE;
 }
 
-/* initialise the app */
-gboolean
-mixgtk_init (int argc, char *argv[])
-{
-  gboolean split = FALSE;
-  gint k;
-
-  mix_init_lib ();
-
-  if (!mixgtk_config_load ())
-    {
-      g_error ("Unable to read configuration\n");
-      return FALSE;
-    }
-
-  for (k = 0; k < argc; ++k)
-    if (!strcmp (argv[k], SPLIT_ARG_) || !strcmp (argv[k], SPLIT_LONG_ARG_))
-      {
-	split = TRUE;
-	break;
-      }
-  if (!split && mixgtk_config_is_split ()) split = TRUE;
-  mixgtk_config_set_split (split);
-
-  gtk_init (&argc, &argv);
-
-  return mixgtk_restart ();
-}
-
 /* main loop */
 void
 mixgtk_main (void)