Index: trunk/Ohana/src/kapa/setup/DefineLayout.c
===================================================================
--- trunk/Ohana/src/kapa/setup/DefineLayout.c	(revision 5612)
+++ trunk/Ohana/src/kapa/setup/DefineLayout.c	(revision 5852)
@@ -5,7 +5,5 @@
 void DefineLayout (int argc, char **argv) {
 
-  int i, status, N;
-  struct sockaddr_un Address;
-  char temp[100];
+  int i;
   
   /** initiate connection with server **/
@@ -15,15 +13,5 @@
       exit (0);
     }
-    strcpy (Address.sun_path, argv[1]);
-    Address.sun_family = AF_UNIX;
-    sock = socket (AF_UNIX, SOCK_STREAM, 0);
-    status = connect (sock, (struct sockaddr *) &Address, sizeof (Address));
-    if (status < 0) {
-      fprintf (stderr, "kapa - unsuccessful connection: %d\n", status);
-      exit (0);
-    }
-    fcntl (sock, F_SETFL, O_NONBLOCK);  
-    sprintf (temp, "rm -f %s", argv[1]);
-    system (temp);
+    sock = KiiWait (argv[1]);
   }