[Antiright-devel] antiright ACE-desktop/guidl/Horizontal_Deskbar....

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/27 21:46:07

Modified files:
        ACE-desktop/guidl: Horizontal_Deskbar.gdl 
        gtkshell       : button.c 
        libantiright   : Makefile library.h macros.h string.c string.h 

Log message:
        Fixed button creation.  Only use assertions when DEBUG is set.
        Removed passing of length variable in antiright_beautify_label
        subroutines.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/Makefile?cvsroot=antiright&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/library.h?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/macros.h?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/libantiright/string.h?cvsroot=antiright&r1=1.4&r2=1.5

Patches:
Index: ACE-desktop/guidl/Horizontal_Deskbar.gdl
===================================================================
RCS file: 
/sources/antiright/antiright/ACE-desktop/guidl/Horizontal_Deskbar.gdl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ACE-desktop/guidl/Horizontal_Deskbar.gdl    23 Apr 2007 00:51:40 -0000      
1.9
+++ ACE-desktop/guidl/Horizontal_Deskbar.gdl    27 Apr 2007 21:46:06 -0000      
1.10
@@ -35,4 +35,3 @@
 add "separator";
 add "updating label" "ACE Custom_Updater";
 
-

Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- gtkshell/button.c   27 Apr 2007 21:33:27 -0000      1.29
+++ gtkshell/button.c   27 Apr 2007 21:46:06 -0000      1.30
@@ -123,7 +123,7 @@
 void
 gsh_new_button(struct GSH * gsh, const gchar * string)
 {
-       if(!test_image_button)  
+       if(!test_image_button(gsh, string))     
                gsh_command_button(gsh, string);
 }
 

Index: libantiright/Makefile
===================================================================
RCS file: /sources/antiright/antiright/libantiright/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libantiright/Makefile       27 Apr 2007 02:02:06 -0000      1.8
+++ libantiright/Makefile       27 Apr 2007 21:46:06 -0000      1.9
@@ -5,7 +5,7 @@
 
 all: libantiright.a
 
-objects=pipe.o string.o system.o util.o tuple.o vector.o
+objects=pipe.o string.o system.o util.o tuple.o 
 
 libantiright.a: ${objects}
        ar rcs libantiright.a ${objects}

Index: libantiright/library.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/library.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- libantiright/library.h      27 Apr 2007 02:02:06 -0000      1.16
+++ libantiright/library.h      27 Apr 2007 21:46:06 -0000      1.17
@@ -35,7 +35,6 @@
 #include "system.h"
 #include "util.h"
 #include "tuple.h"
-#include "vector.h"
 
 #include "macros.h"
 

Index: libantiright/macros.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/macros.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libantiright/macros.h       27 Apr 2007 02:02:06 -0000      1.2
+++ libantiright/macros.h       27 Apr 2007 21:46:06 -0000      1.3
@@ -38,7 +38,11 @@
 #define ARBBOOL(x) (x == TRUE)
 #define ARPBOOL(x) (x != NULL)
 
+#ifdef DEBUG
 #define ARASSERT g_assert
+#else /* not DEBUG */
+#define ARASSERT /* undefined */
+#endif /* DEBUG */
 
 #define ARBASSERT(x) \
        ARASSERT(ARBBOOL(x))

Index: libantiright/string.c
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libantiright/string.c       13 Apr 2007 14:23:51 -0000      1.9
+++ libantiright/string.c       27 Apr 2007 21:46:06 -0000      1.10
@@ -38,10 +38,12 @@
 }
 
 static gint
-get_last_space(const gchar * text, gint length)
+get_last_space(const gchar * text)
 {
        gint i;
+       gint length;
 
+       length=strlen(text);
        for(i = 0; (i < length) && (*(text+length-i) != ' '); i++);
 
        return length - i;
@@ -72,25 +74,26 @@
 }
 
 static char *
-get_substituted_label_from_text(char * text, gint length)
+get_substituted_label_from_text(const gchar * text)
 {
        gchar * formatted;
 
+       {
+               gint length;
+
        length=ar_asprintf(&formatted, "%s", text);
        substitute(&formatted, length);
+       }
 
        return (formatted);
 }
 
 /* Free the returned value!  */
 char *
-antiright_beautified_label(char *text)
+antiright_beautified_label(const gchar *text)
 {
-       gint length;
-
-       length=strlen(text);
-       text += get_last_space(text, length);
+       text += get_last_space(text);
 
-       return get_substituted_label_from_text(text, length);
+       return get_substituted_label_from_text(text);
 }
 

Index: libantiright/string.h
===================================================================
RCS file: /sources/antiright/antiright/libantiright/string.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libantiright/string.h       28 Feb 2007 03:53:51 -0000      1.4
+++ libantiright/string.h       27 Apr 2007 21:46:06 -0000      1.5
@@ -24,10 +24,10 @@
 #define LIBAR_STRING_H
 
 gint
-     ar_asprintf(gchar **string, const gchar *format,...);
+ar_asprintf(gchar **string, const gchar *format, ...);
 
-char *
-     antiright_beautified_label(char *current_argument_string);
+gchar *
+antiright_beautified_label(const gchar *string);
 
 /* char*      */