From e65ad854a2548723e7f0904992f4529cdfb9de1c Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Thu, 24 Jun 2004 01:40:46 +0000
Subject: almost complete (barring bugs) reimplementation of all gmixvm
 functionality in non-split mode for gtk 2.0.

---
 mixgtk/mixgtk.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'mixgtk/mixgtk.c')

diff --git a/mixgtk/mixgtk.c b/mixgtk/mixgtk.c
index 3b926b4..97f6a16 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.16 2004/06/23 10:50:10 jao Exp $
+ * $Id: mixgtk.c,v 1.17 2004/06/24 01:40:48 jao Exp $
  * ------------------------------------------------------------------
  * Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
  *
@@ -36,7 +36,7 @@
 #include "mixgtk.h"
 
 static const gchar *SPLIT_ARG_ = "-s";
-static const gchar *SPLIT_LONG_ARG_ = "--s";
+static const gchar *SPLIT_LONG_ARG_ = "--split";
 
 gboolean
 mixgtk_restart (void)
@@ -49,8 +49,6 @@ mixgtk_restart (void)
       return FALSE;
     }
 
-  mixgtk_fontsel_load_defaults ();
-
   if (!mixgtk_cmd_dispatcher_init (MIXGTK_MAIN))
     {
       g_error (_("Unable to initialise application (command dispatcher)\n"));
@@ -71,9 +69,9 @@ mixgtk_restart (void)
       return FALSE;
     }
 
-  if (!mixgtk_device_init (GTK_NOTEBOOK
+  if (!mixgtk_device_init (GTK_CONTAINER
 			   (mixgtk_widget_factory_get
-			    (MIXGTK_DEVICES_DIALOG, MIXGTK_WIDGET_DEVICE)),
+			    (MIXGTK_DEVICES_DIALOG, MIXGTK_WIDGET_DEVICES)),
 			   vm))
     {
       g_error (_("Unable to initialise application (devices)\n"));
-- 
cgit v1.2.3