Index: trunk/Ohana/src/kapa/graph/LoadLabels.c
===================================================================
--- trunk/Ohana/src/kapa/graph/LoadLabels.c	(revision 2473)
+++ trunk/Ohana/src/kapa/graph/LoadLabels.c	(revision 5852)
@@ -3,6 +3,6 @@
 int LoadLabels () {
   
-  char buffer[256], *c;
-  int status, Nbytes, mode, size;
+  char *c, *label;
+  int mode, size, Nbytes;
   Layout *layout;
   
@@ -11,13 +11,10 @@
   fcntl (sock, F_SETFL, !O_NONBLOCK);  
   
-  status = read (sock, buffer, 16); 
-  buffer[16] = 0; 
-  sscanf (buffer, "%d %d", &Nbytes, &mode); 
+  KiiScanMessage (sock, "%d", &mode);
+  label = KiiRecvData (sock);
 
-  status = read (sock, buffer, Nbytes); 
-  buffer[status] = 0; 
-
-  strncpy (layout[0].label[mode].text, buffer, Nbytes);
-  layout[0].label[mode].text[Nbytes] = 0;
+  Nbytes = MIN (strlen(label), 127);
+  strncpy (layout[0].label[mode].text, label, Nbytes);
+  label[Nbytes] = 0;
 
   fcntl (sock, F_SETFL, O_NONBLOCK);