[Antiright-devel] antiright/gtkshell button.c callbacks.c callbac...

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/04/24 19:31:47

Modified files:
        gtkshell       : button.c callbacks.c callbacks.h guidl.y text.c 

Log message:
        Modified callback functions to follow the gsh_ naming prefix 
convention.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.c?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/callbacks.h?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl.y?cvsroot=antiright&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.18&r2=1.19

Patches:
Index: button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- button.c    16 Apr 2007 02:35:56 -0000      1.24
+++ button.c    24 Apr 2007 19:31:47 -0000      1.25
@@ -73,10 +73,10 @@
 
        if(GTK_IS_MENU_ITEM(gsh->button))
                (void) g_signal_connect(G_OBJECT(gsh->button), 
-                               "activate", G_CALLBACK(system_cb), cb);
+                               "activate", G_CALLBACK(gsh_system_cb), cb);
        else if((gsh->bflags & GSH_MENU_BUTTON) != GSH_MENU_BUTTON)
                (void) g_signal_connect(G_OBJECT(gsh->button), 
-                               "clicked", G_CALLBACK(system_cb), cb);
+                               "clicked", G_CALLBACK(gsh_system_cb), cb);
        else if((gsh->bflags & GSH_MENU_BUTTON) == GSH_MENU_BUTTON)
                gsh->bflags ^= GSH_MENU_BUTTON;
 

Index: callbacks.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- callbacks.c 2 Apr 2007 15:37:14 -0000       1.17
+++ callbacks.c 24 Apr 2007 19:31:47 -0000      1.18
@@ -1,6 +1,6 @@
 /*
   AntiRight
-  (c) 2002-2006 Jeffrey Bedard
+  (c) 2002-2007 Jeffrey Bedard
   address@hidden
 
   This file is part of AntiRight.
@@ -39,7 +39,7 @@
 }
 
 void
-system_cb(GtkWidget *widget, gpointer data)
+gsh_system_cb(GtkWidget *widget, gpointer data)
 {
        struct GSH_CBData *cb;
 
@@ -59,7 +59,7 @@
 }
 
 void
-entry_cb(GtkWidget *widget, gpointer data)
+gsh_entry_cb(GtkWidget *widget, gpointer data)
 {
        const gchar *input;     /* Must not be freed.  */
        struct GSH_CBData *cb;
@@ -86,7 +86,5 @@
                        gtk_combo_box_prepend_text(GTK_COMBO_BOX(combo_box),
                                                   (gchar *)input);
                }
-
-               //gtk_entry_set_text(GTK_ENTRY(widget), "");    /* Clear.  */
        }
 }

Index: callbacks.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/callbacks.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- callbacks.h 24 Mar 2007 04:17:13 -0000      1.6
+++ callbacks.h 24 Apr 2007 19:31:47 -0000      1.7
@@ -30,9 +30,9 @@
 };
 
 void
-system_cb(GtkWidget *widget, gpointer data);
+gsh_system_cb(GtkWidget *widget, gpointer data);
 
 void
-entry_cb(GtkWidget *widget, gpointer data);
+gsh_entry_cb(GtkWidget *widget, gpointer data);
 
 #endif /* not GSH_CALLBACKS_H */

Index: guidl.y
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl.y,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- guidl.y     16 Apr 2007 02:23:29 -0000      1.16
+++ guidl.y     24 Apr 2007 19:31:47 -0000      1.17
@@ -136,12 +136,6 @@
        gsh_add_system_label($4);
 }
 |
-ADD UPDATING PROGRESS STRING
-{
-       gsh_guidl_add("-aup", $4);
-}
-|
-|
 ADD BUTTONS buttons
 ;
 

Index: text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- text.c      2 Apr 2007 15:37:14 -0000       1.18
+++ text.c      24 Apr 2007 19:31:47 -0000      1.19
@@ -52,7 +52,8 @@
 
                field=gtk_bin_get_child(GTK_BIN(entry));
                (void) g_signal_connect(G_OBJECT(field), "activate",
-                                       G_CALLBACK(entry_cb), (gpointer) cb);
+                                       G_CALLBACK(gsh_entry_cb), 
+                                       (gpointer) cb);
        }
        /* Do not fill remaining container area.  */
        gsh_manage_unexpanded(gsh, entry);