Merge pull request #13 from AkselMeola/master
[mirrors/libpurple-core-answerscripts.git] / answerscripts.c
index 0ad50d7..6056851 100755 (executable)
@@ -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;
@@ -220,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()) "
@@ -248,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)
+       //#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)
This page took 0.144038 seconds and 4 git commands to generate.