summaryrefslogtreecommitdiffstats
path: root/friendfinder
diff options
context:
space:
mode:
authorPatrick Hornecker2009-12-28 12:31:46 +0100
committerPatrick Hornecker2009-12-28 12:31:46 +0100
commit90a46a599cac6407fc9c3283c86c1b969b2be64f (patch)
treeda0e46aea5cf8151b3071de7a3e55464db268716 /friendfinder
parentmore changes in threading of msg_sender, receiver and sender...not able to bu... (diff)
downloadfriendfinder-90a46a599cac6407fc9c3283c86c1b969b2be64f.tar.gz
friendfinder-90a46a599cac6407fc9c3283c86c1b969b2be64f.tar.xz
friendfinder-90a46a599cac6407fc9c3283c86c1b969b2be64f.zip
a little fix, can now be built again
Diffstat (limited to 'friendfinder')
-rw-r--r--friendfinder/gui.c8
-rw-r--r--friendfinder/gui.h2
-rw-r--r--friendfinder/handler.c2
-rw-r--r--friendfinder/handler.h2
-rw-r--r--friendfinder/sender.c1
-rw-r--r--friendfinder/sender.h2
6 files changed, 9 insertions, 8 deletions
diff --git a/friendfinder/gui.c b/friendfinder/gui.c
index b5d5bf8..0a39335 100644
--- a/friendfinder/gui.c
+++ b/friendfinder/gui.c
@@ -11,7 +11,7 @@
#include "receiver.h"
#include "sender.h"
-int h = 600;
+int h= 600;
int w = 450;
int first = 0;
@@ -460,11 +460,11 @@ void elm_main ()
int main (int argc, char **argv)
{
- if (argv[1] == NULL && argv[2] == NULL)
+ if (argv[1] == NULL || argv[2] == NULL)
{
printf("no nick and no receiver set");
- from == NULL;
- to == NULL;
+ from = NULL;
+ to = NULL;
}
else
{
diff --git a/friendfinder/gui.h b/friendfinder/gui.h
index 65fd3fa..fec52e2 100644
--- a/friendfinder/gui.h
+++ b/friendfinder/gui.h
@@ -17,7 +17,7 @@ static void on_map(void *data, Evas_Object *obj, void *event_info);
//other functions
void set_bubble_text(Evas_Object *bb, char *username, char *text);
-void show_message(current_msg);
+void show_message(char *current_msg);
char* get_current_time();
//init functions
void init_options();
diff --git a/friendfinder/handler.c b/friendfinder/handler.c
index e3f7087..8d15ed7 100644
--- a/friendfinder/handler.c
+++ b/friendfinder/handler.c
@@ -3,6 +3,7 @@
#include "msg_sender.h"
#include "sender.h"
#include "receiver.h"
+#include "handler.h"
pthread_t msg_thread, sender_thread, receiver_thread;
@@ -19,7 +20,6 @@ void init_msg_thread(char *from, char *to)
void init_receiver_thread(char *from)
{
pthread_create(&sender_thread, NULL, sender_main, (void*) from);
-
}
void init_sender_thread(char *from)
diff --git a/friendfinder/handler.h b/friendfinder/handler.h
index 6de03bd..229c250 100644
--- a/friendfinder/handler.h
+++ b/friendfinder/handler.h
@@ -12,6 +12,6 @@ void init_sender_thread(char *from);
void init_receiver_thread(char *from);
/* close all threads */
-void close_threads()
+void close_threads();
#endif
diff --git a/friendfinder/sender.c b/friendfinder/sender.c
index ed4f90c..3719ded 100644
--- a/friendfinder/sender.c
+++ b/friendfinder/sender.c
@@ -5,6 +5,7 @@
#include "libircclient.h"
#include "openssl/blowfish.h"
+#include "sender.h"
static irc_session_t *session;
irc_callbacks_t callbacks;
diff --git a/friendfinder/sender.h b/friendfinder/sender.h
index 254764c..0e9299a 100644
--- a/friendfinder/sender.h
+++ b/friendfinder/sender.h
@@ -2,6 +2,6 @@
#define __SENDER_H_
/* inits sender */
-void sender_main(void *nick);
+void sender_main(void *user);
#endif