[Antiright-devel] antiright/gtkshell updated_label.c

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 07/02/17 23:32:15

Modified files:
        gtkshell       : updated_label.c 

Log message:
        Resolve conflicts.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_label.c?cvsroot=antiright&r1=1.6&r2=1.7

Patches:
Index: updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- updated_label.c     17 Feb 2007 23:19:58 -0000      1.6
+++ updated_label.c     17 Feb 2007 23:32:15 -0000      1.7
@@ -36,7 +36,7 @@
 }
 
 void
-gsh_update_label(char *command, void *widget)
+gsh_update_label(char *command, gpointer widget)
 {
        char *results;
 
@@ -62,9 +62,9 @@
 
 #ifdef DEBUG
        g_message("gsh_add_updated_label()");
-#endif
+#endif /* DEBUG */
 
     widget=gsh_add_label(gsh, NULL);
-       gsh_add_updater(&gsh_update_label, command, (void*)widget);
+       gsh_add_updater(gsh, &gsh_update_label, command, (gpointer)widget);
 }