initialisation, clean-up and main functionality split

1 files changed, 20 insertions, 18 deletions

diff --git a/mixgtk/mixgtk.c b/mixgtk/mixgtk.c
index 127780b..da67c7e 100644
--- a/mixgtk/mixgtk.c
+++ b/mixgtk/mixgtk.c
@@ -1,7 +1,7 @@
 /* -*-c-*- -------------- mixgtk.c :
- * Main function of the mix gtk front-end
+ * Main functions of the mix gtk front-end
  * ------------------------------------------------------------------
- *  Last change: Time-stamp: "2001-04-24 00:52:32 jao"
+ *  Last change: Time-stamp: "2001-04-28 22:40:32 jao"
  * ------------------------------------------------------------------
  * Copyright (C) 2001 Free Software Foundation, Inc.
  *  
@@ -21,9 +21,6 @@
  *  
  */
 
-#include <stdlib.h>
-#include <gtk/gtk.h>
-#include <mixlib/mix.h>
 #include "mixgtk_widgets.h"
 #include "mixgtk_cmd_dispatcher.h"
 #include "mixgtk_device.h"
@@ -32,9 +29,12 @@
 #include "mixgtk_input.h"
 #include "mixgtk_colorsel.h"
 #include "mixgtk_fontsel.h"
+#include "mixgtk.h"
 
-int
-main(int argc, char *argv[])
+
+/* initialise the app */
+gboolean
+mixgtk_init (int argc, char *argv[])
 {
   mix_vm_t *vm;
   
@@ -47,13 +47,13 @@ main(int argc, char *argv[])
     {
       g_error ("Unable to initialise application (using %s and %s)\n",
 	       GLADE_FILE, LOCAL_GLADE_FILE);
-      return EXIT_FAILURE;
+      return FALSE;
     }
 
   if (!mixgtk_cmd_dispatcher_init ())
     {
       g_error ("Unable to initialise application (command dispatcher)\n");
-      return EXIT_FAILURE;
+      return FALSE;
     }
 
   vm = mixgtk_cmd_dispatcher_get_vm ();
@@ -63,37 +63,39 @@ main(int argc, char *argv[])
 			   vm))
     {
       g_error ("Unable to initialise application (devices)\n");
-      return EXIT_FAILURE;
+      return FALSE;
     }
 
   if (!mixgtk_mixvm_init (vm))
     {
       g_error ("Unable to initialise application (mixvm widgets)\n");
-      return EXIT_FAILURE;
+      return FALSE;
     }
 
   if (!mixgtk_mixal_init (vm))
     {
       g_error ("Unable to initialise application (mixal widgets)\n");
-      return EXIT_FAILURE;
+      return FALSE;
     }
 
   if (!mixgtk_input_init ())
     {
       g_error ("Unable to initialise application (word input widgets)\n");
-      return EXIT_FAILURE;
+      return FALSE;
     }
 
   if (!mixgtk_fontsel_init () || !mixgtk_colorsel_init ())
     {
       g_error ("Unable to initialise application (customization widgets)\n");
-      return EXIT_FAILURE;
+      return FALSE;
     }
     
-  
-  gtk_main();
+  return TRUE;
+}
 
+/* clean up */
+void
+mixgtk_release (void) 
+{
   mix_release_lib ();
-  
-  return EXIT_SUCCESS;
 }