Index: /trunk/FACT++/src/RemoteControl.cc
===================================================================
--- /trunk/FACT++/src/RemoteControl.cc	(revision 14542)
+++ /trunk/FACT++/src/RemoteControl.cc	(revision 14543)
@@ -53,6 +53,6 @@
 
     // Check if we have cd'ed to a valid server
-    const pair<int32_t, string> state = fImp->GetServerState(fCurrentServer);
-    if (state.first==-256)
+    const State state = fImp->GetServerState(fCurrentServer);
+    if (state.index==-256)
         return beg + "> ";
 
@@ -61,9 +61,9 @@
 
     // If no match found or something wrong found just output the server
-    if (state.first<-1)
+    if (state.index<-1)
         return beg + " " + serv + "> ";
 
     // If everything found add the state to the server
-    return beg + " " + serv + ":\033[32m\033[1m" + state.second + "\033[0m> ";
+    return beg + " " + serv + ":\033[32m\033[1m" + state.name + "\033[0m> ";
 }
 
@@ -78,13 +78,13 @@
         return beg + "> ";
 
-    const pair<int32_t, string> state = fImp->GetServerState(fCurrentServer);
-    if (state.first==-256)
+    const State state = fImp->GetServerState(fCurrentServer);
+    if (state.index==-256)
         return beg + "> ";//Form("\n[%d] \033[34m\033[1m%s\033[0m> ", GetLine(), fCurrentServer.c_str());
 
     // If no match found or something wrong found just output the server
-    if (state.first<-1)
+    if (state.index<-1)
         return beg + " " + fCurrentServer + "> ";
 
     // If everything found add the state to the server
-    return beg + " " + fCurrentServer + ":" + state.second + "> ";
+    return beg + " " + fCurrentServer + ":" + state.name + "> ";
 }