From 15d1ea181db5a5de2bafc3fa9602abaa628f4ff5 Mon Sep 17 00:00:00 2001
From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Mon, 19 Mar 2012 13:15:11 +0100
Subject: [PATCH] Remove one level of indirection on ICSInputBoxPopUp

---
 dialogs.c |    4 ++--
 dialogs.h |    2 ++
 xboard.c  |   15 ---------------
 xboard.h  |    1 -
 4 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/dialogs.c b/dialogs.c
index d409164..15fd8c5 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -1074,7 +1074,7 @@ PutText (char *text, int pos)
 }
 
 void
-InputBoxPopup ()
+ICSInputBoxPopUp ()
 {
     MarkMenu("ICS Input Box", InputBoxDlg);
     if(GenericPopUp(boxOptions, _("ICS input box"), InputBoxDlg))
@@ -1109,7 +1109,7 @@ BoxAutoPopUp (char *buf)
 		SetWidgetText(&boxOptions[0], newText, InputBoxDlg);
 		if(shellUp[InputBoxDlg]) HardSetFocus (&boxOptions[0]); //why???
 	    } else icsText = buf; // box did not exist: make sure it pops up with char in it
-	    InputBoxPopup();
+	    ICSInputBoxPopUp();
 	} else PopUpMoveDialog(*buf);
 }
 
diff --git a/dialogs.h b/dialogs.h
index 7962c9d..0bc429f 100644
--- a/dialogs.h
+++ b/dialogs.h
@@ -63,4 +63,6 @@ void ErrorPopUp P((char *title, char *text, int modal));
 
 void BoxAutoPopUp P((char *buf));
 void IcsKey P((int n));
+void ICSInputBoxPopUp P((void));
+
 
diff --git a/xboard.c b/xboard.c
index 3b29828..b21441a 100644
--- a/xboard.c
+++ b/xboard.c
@@ -272,7 +272,6 @@ void DrawPositionProc P((Widget w, XEvent *event,
 void CommentClick P((Widget w, XEvent * event,
 		   String * params, Cardinal * nParams));
 void ICSInputBoxPopUp P((void));
-void ICSInputBoxPopDown P((void));
 void FileNamePopUp P((char *label, char *def, char *filter,
 		      FileProc proc, char *openMode));
 void AskQuestionReplyAction P((Widget w, XEvent *event,
@@ -532,7 +531,6 @@ XtActionsRec boardActions[] = {
     { "TempForwardProc", TempForwardProc },
     { "CommentClick", (XtActionProc) CommentClick },
     { "ErrorPopDown", (XtActionProc) ErrorPopDown },
-    { "ICSInputBoxPopDown", (XtActionProc) ICSInputBoxPopDown },
     { "AskQuestionPopDown", (XtActionProc) AskQuestionPopDown },
     { "GameListPopDown", (XtActionProc) GameListPopDown },
     { "GameListOptionsPopDown", (XtActionProc) GameListOptionsPopDown },
@@ -3741,19 +3739,6 @@ EditCommentPopUp (int index, char *title, char *text)
 }
 
 void
-ICSInputBoxPopUp ()
-{
-    InputBoxPopup();
-}
-
-
-void
-ICSInputBoxPopDown ()
-{
-    PopDown(InputBoxDlg);
-}
-
-void
 CommentPopUp (char *title, char *text)
 {
     savedIndex = currentMove; // [HGM] vari
diff --git a/xboard.h b/xboard.h
index 7a3d5cf..37aa7ed 100644
--- a/xboard.h
+++ b/xboard.h
@@ -138,7 +138,6 @@ void NewCommentPopup P((char *title, char *text, int index));
 void MarkMenu P((char *item, int dlgNr));
 void GetWidgetText P((Option *opt, char **buf));
 void ClearTextWidget P((Option *opt));
-void InputBoxPopup P((void));
 void CatchDeleteWindow(Widget w, String procname);
 void GenericPopDown P((Widget w, XEvent *event, String *prms, Cardinal *nprms));
 void PlaySound P((char *name));
-- 
1.7.0.4