X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=c26d37bc9cafaa8009c46f936e21cc37a517b3a4;hp=2003ca8500ea42b9a249b12a5a2a1b9e7cbc452b;hb=2bcad731832754d3f67219355f1a9878bd38e27d;hpb=ca489436ae23ea28bbd7656635cf20761292fd26

diff --git a/answerscripts.c b/answerscripts.c
index 2003ca8..c26d37b 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -7,10 +7,13 @@
 #define ANSWERSCRIPT "answerscripts" ANSWERSCRIPT_EXT
 #define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
 #define ANSWERSCRIPTS_LINE_LENGTH 4096
+#define ENV_PREFIX "ANSW_"
+#define PROTOCOL_PREFIX "prpl-"
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
+#include <string.h>
 
 #ifndef __WIN32__
 	#include <fcntl.h>
@@ -62,6 +65,10 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	//printf("\nHarvie received: %s: %s\n", who, message); //debug
 	//purple_conv_im_send(purple_conversation_get_im_data(conv), ":-*"); //debug
 
+	//Get protocol ID
+	const char *protocol_id = purple_account_get_protocol_id(account);
+	if(!strncmp(protocol_id,PROTOCOL_PREFIX,strlen(PROTOCOL_PREFIX))) protocol_id += strlen(PROTOCOL_PREFIX); //trim out protocol prefix (eg.: "prpl-irc" => "irc")
+
 	//Get status
 	PurpleStatus *status = purple_account_get_active_status(account);
 	PurpleStatusType *type = purple_status_get_type(status);
@@ -79,10 +86,11 @@ static void received_im_msg_cb(PurpleAccount *account, char *who, char *buffer,
 	}
 
 	//Export variables to environment
-	setenv("PURPLE_FROM", who, 1);
-	setenv("PURPLE_MSG", message, 1);
-	setenv("PURPLE_STATUS", status_id, 1);
-	setenv("PURPLE_STATUS_MSG", status_msg, 1);
+	setenv(ENV_PREFIX "MSG", message, 1);
+	setenv(ENV_PREFIX "FROM", who, 1);
+	setenv(ENV_PREFIX "PROTOCOL", protocol_id, 1);
+	setenv(ENV_PREFIX "STATUS", status_id, 1);
+	setenv(ENV_PREFIX "STATUS_MSG", status_msg, 1);
 
 	//Launch job on background
 	answerscripts_job *job = (answerscripts_job*) malloc(sizeof(answerscripts_job));
@@ -121,7 +129,7 @@ static PurplePluginInfo info = {
 
 	"core-answerscripts",
 	"AnswerScripts",
-	"0.2.2",
+	"0.3.0",
 	"Framework for hooking scripts to process received messages for libpurple clients",
 	"This plugin will execute script ~/.purple/" ANSWERSCRIPT " "
 		"or any other executable called  " ANSWERSCRIPT " and found in purple_user_dir() "