Made everything nicer :-)

diff --git a/Makefile b/Makefile
index 160e3d085ecfdb418a41602598be2079c81cd509..6d8870ebfa7fbf1ad8c8ca48f41a65445675dd3a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,32 +24,29 @@ LIBTOOL := libtool
 ifeq ($(PREFIX),)
   LIB_INSTALL_DIR = $(HOME)/.purple/plugins
 else
 ifeq ($(PREFIX),)
   LIB_INSTALL_DIR = $(HOME)/.purple/plugins
 else

-  LIB_INSTALL_DIR = $(PREFIX)/lib/pidgin
+  LIB_INSTALL_DIR = $(PREFIX)/lib/purple-2/

 endif
 
 endif
 

-PIDGIN_AUTOANSWER = answerscripts
+PLUGIN_NAME = answerscripts

 
 

-PIDGIN_CFLAGS  = $(shell pkg-config pidgin --cflags)
-GTK_CFLAGS   = $(shell pkg-config gtk+-2.0 --cflags)
-PIDGIN_LIBS    = $(shell pkg-config pidgin --libs)
-GTK_LIBS     = $(shell pkg-config gtk+-2.0 --libs)
-PIDGIN_LIBDIR  = $(shell pkg-config --variable=libdir pidgin)/pidgin
+PURPLE_CFLAGS  = $(shell pkg-config purple --cflags)
+PURPLE_LIBS    = $(shell pkg-config purple --libs)

 
 

-all: $(PIDGIN_AUTOANSWER).so
+all: $(PLUGIN_NAME).so

 
 install: all
        mkdir -p $(LIB_INSTALL_DIR)
 
 install: all
        mkdir -p $(LIB_INSTALL_DIR)

-       cp $(PIDGIN_AUTOANSWER).so $(LIB_INSTALL_DIR)
+       cp $(PLUGIN_NAME).so $(LIB_INSTALL_DIR)

 
 

-$(PIDGIN_AUTOANSWER).so: $(PIDGIN_AUTOANSWER).o
-       $(CC) -shared $(CFLAGS) $< -o $@ $(PIDGIN_LIBS) $(GTK_LIBS) -Wl,--export-dynamic -Wl,-soname
+$(PLUGIN_NAME).so: $(PLUGIN_NAME).o
+       $(CC) -shared $(CFLAGS) $< -o $@ $(PURPLE_LIBS) $(GTK_LIBS) -Wl,--export-dynamic -Wl,-soname

 
 

-$(PIDGIN_AUTOANSWER).o:$(PIDGIN_AUTOANSWER).c 
-       $(CC) $(CFLAGS) -fPIC -c $< -o $@ $(PIDGIN_CFLAGS) $(GTK_CFLAGS) -DHAVE_CONFIG_H
+$(PLUGIN_NAME).o:$(PLUGIN_NAME).c 
+       $(CC) $(CFLAGS) -fPIC -c $< -o $@ $(PURPLE_CFLAGS) $(GTK_CFLAGS) -DHAVE_CONFIG_H

 
 clean:
        rm -rf *.o *.c~ *.h~ *.so *.la .libs
 
 user:
        cp -r purple/* $(HOME)/.purple/
 
 clean:
        rm -rf *.o *.c~ *.h~ *.so *.la .libs
 
 user:
        cp -r purple/* $(HOME)/.purple/

-       mv $(HOME)/.purple/$(PIDGIN_AUTOANSWER).sh $(HOME)/.purple/$(PIDGIN_AUTOANSWER).exe
+       mv $(HOME)/.purple/$(PLUGIN_NAME).sh $(HOME)/.purple/$(PLUGIN_NAME).exe

diff --git a/TODO b/TODO
index e9841ee83055824273b168e76d06e7d1b7e6fc5d..49b11b471e408ceff6245eaac7481575df71f742 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,3 +1,3 @@
 TODO:
 TODO:

-  * process everything asynchronously
+       * documentation

        * more example scripts (user contributions welcome)
        * more example scripts (user contributions welcome)

diff --git a/answerscripts.c b/answerscripts.c
index df61a270cee9107fcddb17583591109780edbfb3..f33741a8da9a61128d07befac31c0c5bf603693a 100755 (executable)
--- a/answerscripts.c
+++ b/answerscripts.c
@@ -1,15 +1,13 @@
+//#define __WIN32__

 #define PURPLE_PLUGINS
 
 /* Purple headers */
 #include <libpurple/debug.h>
 #include <libpurple/version.h>
 #include <libpurple/conversation.h>
 #define PURPLE_PLUGINS
 
 /* Purple headers */
 #include <libpurple/debug.h>
 #include <libpurple/version.h>
 #include <libpurple/conversation.h>

-#include <libpurple/debug.h>
-#include <libpurple/log.h>
+//#include <libpurple/log.h>

 #include <libpurple/plugin.h>
 #include <libpurple/plugin.h>

-#include <libpurple/pluginpref.h>
-#include <libpurple/prefs.h>
-#include <libpurple/signals.h>
+//#include <libpurple/signals.h>

 #include <libpurple/util.h>
 #include <libpurple/notify.h>
 
 #include <libpurple/util.h>
 #include <libpurple/notify.h>
 


@@ -17,16 +15,14 @@
 #include <stdlib.h>
 #include <errno.h>
 
 #include <stdlib.h>
 #include <errno.h>
 

-#define ANSWERSCRIPT "answerscripts.exe"
-#define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
-#define ANSWERSCRIPTS_LINE_LENGTH 4096
-
-//#define __WIN32__
-

 #ifndef __WIN32__
        #include <fcntl.h>
 #endif
 
 #ifndef __WIN32__
        #include <fcntl.h>
 #endif
 

+#define ANSWERSCRIPT "answerscripts.exe"
+#define ANSWERSCRIPTS_TIMEOUT_INTERVAL 250
+#define ANSWERSCRIPTS_LINE_LENGTH 4096
+

 char *buff = NULL;
 char *hook_script = NULL;
 char response[ANSWERSCRIPTS_LINE_LENGTH+1];
 char *buff = NULL;
 char *hook_script = NULL;
 char response[ANSWERSCRIPTS_LINE_LENGTH+1];


@@ -56,11 +52,8 @@ int answerscripts_process_message_cb(answerscripts_job *job) {
        return 0;
 }
 
        return 0;
 }
 

-static void
-received_im_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConversation *conv, PurpleMessageFlags flags, void *data) {
-
-       /* A workaround to avoid skipping of the first message as a result on NULL-conv: */
-       if (conv == NULL) conv = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, who);
+static void received_im_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: */

 
        buff = purple_markup_strip_html(buffer);
        //printf("\nHarvie received: %s: %s\n", who, buff); //debug
 
        buff = purple_markup_strip_html(buffer);
        //printf("\nHarvie received: %s: %s\n", who, buff); //debug


@@ -80,24 +73,19 @@ received_im_msg_cb(PurpleAccount *account, char *who, char *buffer, PurpleConver
        #endif
 
        purple_timeout_add(ANSWERSCRIPTS_TIMEOUT_INTERVAL, (GSourceFunc) answerscripts_process_message_cb, (gpointer) job);
        #endif
 
        purple_timeout_add(ANSWERSCRIPTS_TIMEOUT_INTERVAL, (GSourceFunc) answerscripts_process_message_cb, (gpointer) job);

-

 }
 
 
 static gboolean plugin_load(PurplePlugin * plugin) {
        asprintf(&hook_script,"%s/%s",purple_user_dir(),ANSWERSCRIPT);
 }
 
 
 static gboolean plugin_load(PurplePlugin * plugin) {
        asprintf(&hook_script,"%s/%s",purple_user_dir(),ANSWERSCRIPT);

-

        void *conv_handle = purple_conversations_get_handle();
        void *conv_handle = purple_conversations_get_handle();

-
-       purple_signal_connect(conv_handle, "received-im-msg",
-                             plugin, PURPLE_CALLBACK(received_im_msg_cb),
-                             NULL);
-       return TRUE;
+       purple_signal_connect(conv_handle, "received-im-msg", plugin, PURPLE_CALLBACK(received_im_msg_cb), NULL);
+       return 0;

 }
 
 static gboolean plugin_unload(PurplePlugin * plugin) {
        free(hook_script);
 }
 
 static gboolean plugin_unload(PurplePlugin * plugin) {
        free(hook_script);

-       return TRUE;
+       return 0;

 }
 
 static PurplePluginInfo info = {
 }
 
 static PurplePluginInfo info = {