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

diff --git a/answerscripts.c b/answerscripts.c
index ed13b83..6056851 100755
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -46,7 +46,10 @@ typedef struct {
 } answerscripts_job;
 
 const void *check_null(const void *pointer) {
-	if(pointer == NULL) return "";
+	if(pointer == NULL) {
+		fprintf(stderr, "NULL pointer detected in answerscripts!\n");
+		return "";
+	}
 	return pointer;
 }
 
@@ -76,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);
@@ -107,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;
@@ -181,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;
 
@@ -193,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;