[Antiright-devel] antiright/gtkshell button.c guidl.lex menu.c

[Jeffrey Bedard]

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

Modified files:
        gtkshell       : button.c guidl.lex menu.c 

Log message:
        Debugging guidl button addition.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.lex?cvsroot=antiright&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/menu.c?cvsroot=antiright&r1=1.3&r2=1.4

Patches:
Index: button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- button.c    27 Apr 2007 20:51:42 -0000      1.28
+++ button.c    27 Apr 2007 21:33:27 -0000      1.29
@@ -92,27 +92,39 @@
        gsh_manage_unexpanded(gsh, gsh->button);
 }
 
-void
-gsh_new_button(struct GSH * gsh, const gchar * string)
+static gboolean
+test_pair(struct GSH * gsh, gchar **pair)
+{
+       if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
+               gsh_image_button(gsh, pair[0], pair[1]);
+       else
+               return FALSE;
+
+       return TRUE;
+}
+
+static gboolean
+test_image_button(struct GSH * gsh, const gchar * string)
 {
        gchar **pair;
 
        pair=g_strsplit(string, ",", 2);
-       if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
+       ARPASSERT(pair);
        {
-               gchar * command;
+               gboolean return_value;
 
-               if(ar_asprintf(&command, "%s", pair[0]) != -1)
-               {
-                       gsh_image_button(gsh, command, pair[1]);
-                       g_free(command);
-               }
-               else /* Allocation was unsuccessful.  */
-                       ARWARN("cannot create button");
+               return_value=test_pair(gsh, pair);
+               g_strfreev(pair);
+
+               return return_value;
        }
-       else
+}
+
+void
+gsh_new_button(struct GSH * gsh, const gchar * string)
+{
+       if(!test_image_button)  
                gsh_command_button(gsh, string);
-       g_strfreev(pair);
 }
 
 /* This is just a wrapper around gsh_new_button(), to

Index: guidl.lex
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.lex,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- guidl.lex   27 Apr 2007 20:51:42 -0000      1.11
+++ guidl.lex   27 Apr 2007 21:33:27 -0000      1.12
@@ -15,8 +15,8 @@
 ;              return END;
 option         return OPTION;
 add            return ADD;
-button         return BUTTON;
 buttons                return BUTTONS;
+button         return BUTTON;
 echo           return TOKEN_ECHO;
 dialog         return DIALOG;
 [ \t\n]                /* ignore */;

Index: menu.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/menu.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- menu.c      27 Apr 2007 20:51:42 -0000      1.3
+++ menu.c      27 Apr 2007 21:33:27 -0000      1.4
@@ -33,13 +33,11 @@
 
        pair=g_strsplit(string, ",", 2);
 
-       if(ar_asprintf(&command, "%s", pair[0]) == -1)
-       {
-               ARWARN("could not construct command string");
-               return;
-       }
+       command=g_strdup(pair[0]);
 
+#ifdef DEBUG
        ARPASSERT(command);
+#endif /* DEBUG */
 
        if(ARPBOOL(pair[0]) && ARPBOOL(pair[1]))
                gsh_image_button(gsh, command, pair[1]);