X-Git-Url: http://git.harvie.cz/?p=mirrors%2Flibpurple-core-answerscripts.git;a=blobdiff_plain;f=answerscripts.c;h=60568519d334a4ee26a4b7a980067af9d37c6a7e;hp=bb3d8498458b9f7d5962d76d6847db7bf57e6379;hb=25fb4d265d46d9d2b7c6d33a73dc5a0f0a3f93f8;hpb=5cd90c724ea732d22049421acc0e5da739af7076

diff --git a/answerscripts.c b/answerscripts.c
index bb3d849..6056851 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -1,3 +1,4 @@
+#define _GNU_SOURCE
 //#define __WIN32__
 #ifndef __WIN32__
 	#define ANSWERSCRIPT_EXT ""
@@ -23,12 +24,18 @@
 
 /* Purple plugin */
 #define PURPLE_PLUGINS
-#include <libpurple/debug.h>
-#include <libpurple/version.h>
+#include <libpurple/account.h>
+#include <libpurple/blist.h>
 #include <libpurple/conversation.h>
+#include <libpurple/core.h>
+#include <libpurple/debug.h>
 #include <libpurple/plugin.h>
+#include <libpurple/savedstatuses.h>
 #include <libpurple/signals.h>
+#include <libpurple/status.h>
 #include <libpurple/util.h>
+#include <libpurple/value.h>
+#include <libpurple/version.h>
 
 char *message = NULL;
 char *hook_script = NULL;
@@ -38,6 +45,14 @@ typedef struct {
   PurpleConversation *conv;
 } answerscripts_job;
 
+const void *check_null(const void *pointer) {
+	if(pointer == NULL) {
+		fprintf(stderr, "NULL pointer detected in answerscripts!\n");
+		return "";
+	}
+	return pointer;
+}
+
 int answerscripts_process_message_cb(answerscripts_job *job) {
 	int i;
 	char response[ANSWERSCRIPTS_LINE_LENGTH+1]; response[0]='\0';
@@ -64,7 +79,7 @@ int answerscripts_process_message_cb(answerscripts_job *job) {
 	return 0;
 }
 
-static void received_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConversation *conv, PurpleMessageFlags flags, void *data) {
+static char received_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConversation *conv, PurpleMessageFlags flags, void *data) {
 	if (conv == NULL) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who); //* A workaround to avoid skipping of the first message as a result on NULL-conv: */
 
 	PurpleBuddy *buddy = purple_find_buddy(account, who);
@@ -95,7 +110,7 @@ static void received_msg_cb(PurpleAccount *account, char *who, char *buffer, Pur
 	if(local_alias == NULL) local_alias = local_name;
 
 	//Do not respond to messages sent by myself
-	if(strcmp(local_name, who) == 0) return;
+	if (flags & PURPLE_MESSAGE_SEND) return 0; 
 
 	//Was my nick said?
 	char *highlighted;
@@ -136,14 +151,14 @@ static void received_msg_cb(PurpleAccount *account, char *who, char *buffer, Pur
 	//Get status message
 	const char *status_msg = NULL;
 	if (purple_status_type_get_attr(type, "message") != NULL) {
-		status_msg = purple_status_get_attr_string(status, "message");
+		status_msg = check_null(purple_status_get_attr_string(status, "message"));
 	} else {
-		status_msg = (char *) purple_savedstatus_get_message(purple_savedstatus_get_current());
+		status_msg = (char *) check_null(purple_savedstatus_get_message(purple_savedstatus_get_current()));
 	}
 	//remote
 	const char *r_status_msg = NULL;
 	if (purple_status_type_get_attr(r_status_type, "message") != NULL) {
-		r_status_msg = purple_status_get_attr_string(r_status, "message");
+		r_status_msg = check_null(purple_status_get_attr_string(r_status, "message"));
 	} else {
 		r_status_msg = "";
 	}
@@ -169,7 +184,7 @@ static void received_msg_cb(PurpleAccount *account, char *who, char *buffer, Pur
 	job->pipe = popen(hook_script, "r");
 	if(job->pipe == NULL) {
 		fprintf(stderr,"Can't execute %s\n", hook_script);
-		return;
+		return 0;
 	}
 	job->conv = conv;
 
@@ -181,11 +196,15 @@ static void received_msg_cb(PurpleAccount *account, char *who, char *buffer, Pur
 	#endif
 
 	purple_timeout_add(ANSWERSCRIPTS_TIMEOUT_INTERVAL, (GSourceFunc) answerscripts_process_message_cb, (gpointer) job);
+
+	return 0;
 }
 
 static gboolean plugin_load(PurplePlugin * plugin) {
 	asprintf(&hook_script,"%s/%s",purple_user_dir(),ANSWERSCRIPT);
 	void *conv_handle = purple_conversations_get_handle();
+	//purple_signal_connect(conv_handle, "receiving-im-msg", plugin, PURPLE_CALLBACK(received_msg_cb), NULL);
+	//purple_signal_connect(conv_handle, "receiving-chat-msg", plugin, PURPLE_CALLBACK(received_msg_cb), NULL);
 	purple_signal_connect(conv_handle, "received-im-msg", plugin, PURPLE_CALLBACK(received_msg_cb), NULL);
 	purple_signal_connect(conv_handle, "received-chat-msg", plugin, PURPLE_CALLBACK(received_msg_cb), NULL);
 	return TRUE;
@@ -208,7 +227,7 @@ static PurplePluginInfo info = {
 
 	"core-answerscripts",
 	"AnswerScripts",
-	"0.5.3",
+	"0.5.4",
 	"Framework for hooking scripts to process received messages for libpurple clients",
 	"\nThis plugin will execute script \"~/.purple/" ANSWERSCRIPT "\" "
 		"(or any other executable called \"" ANSWERSCRIPT "\" and found in purple_user_dir()) "
@@ -236,12 +255,12 @@ static PurplePluginInfo info = {
 
 static void init_plugin(PurplePlugin * plugin) {
 	//Export static environment variables
-	#ifndef __x86_64__ //Workaround for x86_64 (where this causes problems for unknown reason)
-		const char * core_ui = purple_core_get_ui() != 0 ? (const char *) purple_core_get_ui() : "";
-		const char * core_version = purple_core_get_version() != 0 ? (const char *) purple_core_get_version() : "";
+	//#ifndef __x86_64__ //Workaround for x86_64 (where this causes problems for unknown reason)
+		const char * core_ui = check_null(purple_core_get_ui());
+		const char * core_version = check_null(purple_core_get_version());
 		setenv(ENV_PREFIX "L_AGENT", (char *) core_ui, 1);	//ID of IM client used with answerscripts
 		setenv(ENV_PREFIX "L_AGENT_VERSION", (char *) core_version, 1);	//Version of client
-	#endif
+	//#endif
 }
 
 PURPLE_INIT_PLUGIN(autoanswer, init_plugin, info)