[Antiright-devel] antiright/gtkshell arguments.c button.c gtkshell.h

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/03/04 23:23:20

Modified files:
        gtkshell       : arguments.c button.c gtkshell.h 

Log message:
        Do not add command callback if button launches a menu.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/arguments.c?cvsroot=antiright&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gtkshell.h?cvsroot=antiright&r1=1.21&r2=1.22

Patches:
Index: arguments.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/arguments.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- arguments.c 4 Mar 2007 23:12:38 -0000       1.9
+++ arguments.c 4 Mar 2007 23:23:20 -0000       1.10
@@ -94,6 +94,7 @@
                /* Set gsh->rows.v to a row within a menu.
                 * Create the menu before overwriting, then
                 * set back at end.  */
+               gsh->bflags |= GSH_MENU_BUTTON;
                new_button(gsh, tokens[0]);
                gsh->rows.v=gtk_menu_new(); 
                gtk_widget_show(gsh->rows.v);
@@ -106,7 +107,7 @@
                gsh->rows.v=oldrow;
        }
        else
-               gsh_command_button(gsh, string);
+               gsh_command_button(gsh, (char *)string);
 
        g_strfreev(tokens);
 }

Index: button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- button.c    4 Mar 2007 23:11:04 -0000       1.18
+++ button.c    4 Mar 2007 23:23:20 -0000       1.19
@@ -78,12 +78,14 @@
                                "activate", G_CALLBACK(system_cb), cb);
 
                }
-               else
+               else if((gsh->bflags & GSH_MENU_BUTTON) != GSH_MENU_BUTTON)
                {
                        /* @null@ */
                        (void) g_signal_connect(G_OBJECT(gsh->button), 
                                "clicked", G_CALLBACK(system_cb), cb);
                }
+               else if((gsh->bflags & GSH_MENU_BUTTON) == GSH_MENU_BUTTON)
+                       gsh->bflags ^= GSH_MENU_BUTTON;
 
        }
 

Index: gtkshell.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gtkshell.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkshell.h  2 Mar 2007 03:56:07 -0000       1.21
+++ gtkshell.h  4 Mar 2007 23:23:20 -0000       1.22
@@ -50,6 +50,7 @@
 #define GSH_HORIZONTAL_LABELS  8
 #define GSH_PROMPT_ECHOES      16
 #define GSH_FRAMED_LABELS      32
+#define GSH_MENU_BUTTON                64
 
 struct GSH
 {