unitsync: don'T export Message()

spring · May 20, 2009 · 07abaf1 · 07abaf1
1 parent 7a9c7ec
commit 07abaf1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 45 deletions.
diff --git a/tools/unitsync/javabind.cpp b/tools/unitsync/javabind.cpp
@@ -26,7 +26,6 @@
 #endif
 
 EXPORT(const char* ) GetSpringVersion();
-EXPORT(void        ) Message(const char* p_szMessage);
 EXPORT(void        ) UnInit();
 EXPORT(int         ) ProcessUnits(void);
 EXPORT(int         ) ProcessUnitsNoChecksum(void);
@@ -151,18 +150,6 @@ extern "C" {
 			return env->NewStringUTF(GetSpringVersion());
 		}
 
-	/*
-	* Class:     aflobby_CUnitSyncJNIBindings
-	* Method:    Message
-	* Signature: (Ljava/lang/String;)V
-	*/
-	JNIEXPORT void JNICALL Java_aflobby_CUnitSyncJNIBindings_Message
-		(JNIEnv *env, jclass myobject, jstring  p_szMessage){
-			const char* c = env->GetStringUTFChars( p_szMessage,0);
-			Message(c);
-			env->ReleaseStringUTFChars( p_szMessage,c);
-		}
-
 	/*
 	* Class:     aflobby_CUnitSyncJNIBindings
 	* Method:    Init

diff --git a/tools/unitsync/pybind.cpp b/tools/unitsync/pybind.cpp
@@ -22,7 +22,6 @@
 
 
 EXPORT(const char* ) GetSpringVersion();
-EXPORT(void        ) Message(const char* p_szMessage);
 EXPORT(void        ) UnInit();
 EXPORT(int         ) ProcessUnits(void);
 EXPORT(int         ) ProcessUnitsNoChecksum(void);
@@ -79,15 +78,6 @@ static PyObject *unitsync_GetSpringVersion(PyObject *self, PyObject *args)
 	return Py_BuildValue("s", GetSpringVersion());
 }
 
-static PyObject *unitsync_Message(PyObject *self, PyObject *args)
-{
-	const char *msg;
-	if (!PyArg_ParseTuple(args, "s", &msg))
-		return NULL;
-	Message(msg);
-	return Py_BuildValue("");
-}
-
 static PyObject *unitsync_Init(PyObject *self, PyObject *args)
 {
 	int isServer;
@@ -596,7 +586,6 @@ static PyMethodDef unitsyncMethods[] = {
 #define PY(name)         { # name , unitsync_ ## name , METH_VARARGS , NULL }
 #define PYDOC(name, doc) { # name , unitsync_ ## name , METH_VARARGS , doc  }
 	PY( GetSpringVersion ),
-	PY( Message ),
 	PY( Init ),
 	PY( UnInit ),
 	PY( ProcessUnits ),

diff --git a/tools/unitsync/unitsync.cpp b/tools/unitsync/unitsync.cpp
@@ -216,24 +216,6 @@ EXPORT(const char*) GetSpringVersion()
 }
 
 
-/**
- * @brief Creates a messagebox with said message
- * @param p_szMessage string holding the message
- *
- * Creates a messagebox with the title "Message from DLL", an OK button, and the specified message
- */
-EXPORT(void) Message(const char* p_szMessage)
-{
-	try {
-		logOutput.Print(LOG_UNITSYNC, "Message from DLL: %s\n", p_szMessage);
-#ifdef WIN32
-		MessageBox(NULL, p_szMessage, "Message from DLL", MB_OK);
-#endif
-	}
-	UNITSYNC_CATCH_BLOCKS;
-}
-
-
 static void _UnInit()
 {
 	lpClose();
@@ -2947,7 +2929,10 @@ class CMessageOnce
 		{
 			if (alreadyDone) return;
 			alreadyDone = true;
-			Message(msg.c_str());
+			logOutput.Print(LOG_UNITSYNC, "Message from DLL: %s\n", msg.c_str());
+#ifdef WIN32
+			MessageBox(NULL, msg.c_str(), "Message from DLL", MB_OK);
+#endif
 		}
 };
 

diff --git a/tools/unitsync/unitsync_api.h b/tools/unitsync/unitsync_api.h
@@ -9,8 +9,6 @@
 EXPORT(const char* ) GetNextError();
 EXPORT(const char* ) GetSpringVersion();
 
-EXPORT(void        ) Message(const char* p_szMessage);
-
 EXPORT(int         ) Init(bool isServer, int id);
 EXPORT(void        ) UnInit();