[Antiright-devel] antiright/gtkshell updated_label.c

[Jeffrey Bedard]

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

Modified files:
        gtkshell       : updated_label.c 

Log message:
        Resolved conflicts.  

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

Patches:
Index: updated_label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_label.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- updated_label.c     17 Feb 2007 23:07:31 -0000      1.5
+++ updated_label.c     17 Feb 2007 23:19:58 -0000      1.6
@@ -42,7 +42,10 @@
 
 #ifdef DEBUG
        g_message("gsh_update_label()");
-#endif
+
+    assert(command);
+    assert(widget);
+#endif /* DEBUG */
 
        results=antiright_pipe_read(command);
 
@@ -60,9 +63,8 @@
 #ifdef DEBUG
        g_message("gsh_add_updated_label()");
 #endif
-       widget=gtk_label_new("");
-       gsh_manage(gsh, widget);
-       gsh_add_updater(gsh, &gsh_update_label, 
-       command, (void*)widget);
+
+    widget=gsh_add_label(gsh, NULL);
+       gsh_add_updater(&gsh_update_label, command, (void*)widget);
 }