Index: trunk/Ohana/src/opihi/cmd.data/labels.c
===================================================================
--- trunk/Ohana/src/opihi/cmd.data/labels.c	(revision 3692)
+++ trunk/Ohana/src/opihi/cmd.data/labels.c	(revision 5850)
@@ -36,12 +36,10 @@
     size = atof (argv[N]);
     remove_argument (N, &argc, argv);
-    SendGraphCommand (Xgraph, 4, "FONT");
-    SendGraphCommand (Xgraph, 16, "%s", name);
-    SendGraphCommand (Xgraph, 16, "%d", size);
+    KapaSetFont (Xgraph, name, size);
   } 
 
   if ((N = get_argument (argc, argv, "-x"))) {
     remove_argument (N, &argc, argv);
-    SendLabel (argv[N], Xgraph, 0);
+    KapaSendLabel (Xgraph, argv[N], 0);
     remove_argument (N, &argc, argv);
   }
@@ -49,5 +47,5 @@
   if ((N = get_argument (argc, argv, "-y"))) {
     remove_argument (N, &argc, argv);
-    SendLabel (argv[N], Xgraph, 1);
+    KapaSendLabel (Xgraph, argv[N], 1);
     remove_argument (N, &argc, argv);
   }
@@ -55,5 +53,5 @@
   if ((N = get_argument (argc, argv, "+x"))) {
     remove_argument (N, &argc, argv);
-    SendLabel (argv[N], Xgraph, 2);
+    KapaSendLabel (Xgraph, argv[N], 2);
     remove_argument (N, &argc, argv);
   }
@@ -61,5 +59,5 @@
   if ((N = get_argument (argc, argv, "+y"))) {
     remove_argument (N, &argc, argv);
-    SendLabel (argv[N], Xgraph, 3);
+    KapaSendLabel (Xgraph, argv[N], 3);
     remove_argument (N, &argc, argv);
   }
@@ -67,5 +65,5 @@
   if ((N = get_argument (argc, argv, "-ul"))) {
     remove_argument (N, &argc, argv);
-    SendLabel (argv[N], Xgraph, 4);
+    KapaSendLabel (Xgraph, argv[N], 4);
     remove_argument (N, &argc, argv);
   }
@@ -73,5 +71,5 @@
   if ((N = get_argument (argc, argv, "-ur"))) {
     remove_argument (N, &argc, argv);
-    SendLabel (argv[N], Xgraph, 5);
+    KapaSendLabel (Xgraph, argv[N], 5);
     remove_argument (N, &argc, argv);
   }
@@ -79,5 +77,5 @@
   if ((N = get_argument (argc, argv, "-ll"))) {
     remove_argument (N, &argc, argv);
-    SendLabel (argv[N], Xgraph, 6);
+    KapaSendLabel (Xgraph, argv[N], 6);
     remove_argument (N, &argc, argv);
   }
@@ -85,5 +83,5 @@
   if ((N = get_argument (argc, argv, "-lr"))) {
     remove_argument (N, &argc, argv);
-    SendLabel (argv[N], Xgraph, 7);
+    KapaSendLabel (Xgraph, argv[N], 7);
     remove_argument (N, &argc, argv);
   }