[Antiright-devel] antiright configure ACE-desktop/ACE gtkshell/bu...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/21 19:44:50

Modified files:
        .              : configure 
        ACE-desktop    : ACE 
        gtkshell       : button.c callbacks.c main.c 

Log message:
        Changed layout of ACE Settings window.
        Changed allocation of application structure for gtkshell to main stack.
        Added detection of distcc to configure.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/configure?cvsroot=antiright&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/ACE?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/main.c?cvsroot=antiright&r1=1.6&r2=1.7

Patches:
Index: configure
===================================================================
RCS file: /sources/antiright/antiright/configure,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- configure   21 Feb 2007 16:15:49 -0000      1.77
+++ configure   21 Feb 2007 19:44:50 -0000      1.78
@@ -57,9 +57,14 @@
 fi
 
 if [ "$CC" = "" ]; then
-
-       CC="$(which ccache) cc"
-
+    CCACHE=$(which ccache)
+    DISTCC=$(which distcc)
+    if [ "$DISTCC" != "" ]; then
+             CC=$DISTCC
+    else
+        CC=cc
+    fi
+    CC="$CCACHE $CC"
        if [ "$CC" = "" ]; then
                CC=cc
        fi

Index: ACE-desktop/ACE
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/ACE,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ACE-desktop/ACE     21 Feb 2007 16:15:49 -0000      1.6
+++ ACE-desktop/ACE     21 Feb 2007 19:44:50 -0000      1.7
@@ -340,7 +340,7 @@
        # Ensure the existance of a configuration file.
     ACE_Check_Configuration_File
     local TMP=${TMPDIR:-/tmp}/ACE.$$
-    echo "$ARSHELL -or 9"\\ > $TMP
+    echo "$ARSHELL -os -or 11"\\ > $TMP
     for title in $(ACE_record_titles)
       do
       echo " \"ACE -A Settings_Node $title\""\\ >> $TMP

Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gtkshell/button.c   20 Feb 2007 04:29:43 -0000      1.8
+++ gtkshell/button.c   21 Feb 2007 19:44:50 -0000      1.9
@@ -1,6 +1,6 @@
 /*
   AntiRight
-  (c) 2002-2006 Jeffrey Bedard
+  (c) 2002-2007 Jeffrey Bedard
   address@hidden
 
   This file is part of AntiRight.

Index: gtkshell/callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/callbacks.c        20 Feb 2007 04:29:43 -0000      1.6
+++ gtkshell/callbacks.c        21 Feb 2007 19:44:50 -0000      1.7
@@ -22,11 +22,18 @@
 
 #include "gtkshell.h"
 
+#define DEBUG
+
 void
 gsh_test_exit (struct GSH * gsh)
 {
+#ifdef DEBUG
+  ARBUG("gsh_test_exit()");
+#endif /* DEBUG */
+  assert(gsh);
   if (gsh->flags.button_exits)
     exit (0);
+  ARBUG("made it");
 }
 
 void
@@ -35,6 +42,10 @@
   struct GSH_CBData *cb;
   cb = (struct GSH_CBData *) data;
 
+#ifdef DEBUG
+  ARBUG("system_cb");
+#endif /* DEBUG */
+
   UNUSED (widget);
 
   antiright_system (cb->data);

Index: gtkshell/main.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/main.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/main.c     20 Feb 2007 04:29:43 -0000      1.6
+++ gtkshell/main.c     21 Feb 2007 19:44:50 -0000      1.7
@@ -1,6 +1,6 @@
 /*
   AntiRight
-  (c) 2002-2006 Jeffrey Bedard
+  (c) 2002-2007 Jeffrey Bedard
   address@hidden
 
   This file is part of AntiRight.
@@ -25,25 +25,22 @@
 int
 main (int argc, char **argv)
 {
-  struct GSH *gsh;
+  struct GSH gsh; // Store application structure on stack.
 
-  gsh = gsh_init (&argc, &argv);
+  gsh_stack_init (&gsh, &argc, &argv);
 
-  gsh->flags.dont_scroll =
+  gsh.flags.dont_scroll =
     (((argc > 1)
       && (strlen (argv[1]) == 3))
      && !strncmp (argv[1], "-os", 3))
     ? TRUE : FALSE;
 
-  gsh_setup_containers (gsh);
-  gsh_parse_arguments (gsh, argc, argv);
+  gsh_setup_containers (&gsh);
+  gsh_parse_arguments (&gsh, argc, argv);
 
-  gsh_check_and_set_geometry (gsh);
+  gsh_check_and_set_geometry (&gsh);
 
-  gtk_widget_show (gsh->window);
-
-  /* Free object references and initialization variables */
-  g_free (gsh);
+  gtk_widget_show (gsh.window);
 
   gtk_main ();