diff options
Diffstat (limited to 'mixgtk/mixgtk.c')
| -rw-r--r-- | mixgtk/mixgtk.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/mixgtk/mixgtk.c b/mixgtk/mixgtk.c index 7cad87a..3b926b4 100644 --- a/mixgtk/mixgtk.c +++ b/mixgtk/mixgtk.c @@ -1,24 +1,24 @@ /* -*-c-*- -------------- mixgtk.c : * Main functions of the mix gtk front-end * ------------------------------------------------------------------ - * $Id: mixgtk.c,v 1.15 2002/04/10 23:39:40 jao Exp $ + * $Id: mixgtk.c,v 1.16 2004/06/23 10:50:10 jao Exp $ * ------------------------------------------------------------------ - * Copyright (C) 2001, 2002 Free Software Foundation, Inc. - * + * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc. + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * + * */ #include <stdio.h> @@ -30,7 +30,6 @@ #include "mixgtk_mixvm.h" #include "mixgtk_mixal.h" #include "mixgtk_input.h" -#include "mixgtk_colorsel.h" #include "mixgtk_fontsel.h" #include "mixgtk_config.h" #include "mixgtk_wm.h" @@ -43,7 +42,7 @@ gboolean mixgtk_restart (void) { mix_vm_t *vm; - + if (!mixgtk_widget_factory_init ()) { g_error (_("Unable to initialise application: missing glade file")); @@ -59,7 +58,7 @@ mixgtk_restart (void) } vm = mixgtk_cmd_dispatcher_get_vm (); - + if (!mixgtk_mixvm_init (vm, MIXGTK_MIXVM_DIALOG)) { g_error (_("Unable to initialise application (mixvm widgets)\n")); @@ -80,7 +79,7 @@ mixgtk_restart (void) g_error (_("Unable to initialise application (devices)\n")); return FALSE; } - + if (!mixgtk_wm_init ()) { g_error (_("Unable to initialise application (visibility)\n")); @@ -88,7 +87,6 @@ mixgtk_restart (void) } mixgtk_input_init (); - mixgtk_colorsel_init (); gtk_widget_show (mixgtk_widget_factory_get_dialog (MIXGTK_MAIN)); mixgtk_mixvm_update_vm_widgets (); @@ -102,15 +100,15 @@ 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_)) { @@ -119,7 +117,7 @@ mixgtk_init (int argc, char *argv[]) } if (!split && mixgtk_config_is_split ()) split = TRUE; mixgtk_config_set_split (split); - + gtk_init (&argc, &argv); return mixgtk_restart (); @@ -134,7 +132,7 @@ mixgtk_main (void) /* clean up */ void -mixgtk_release (void) +mixgtk_release (void) { if (mixgtk_config_is_autosave ()) mixgtk_config_save (); mix_vm_cmd_dispatcher_delete (mixgtk_cmd_dispatcher_get_mix_dispatcher ()); |