[Gaim-commits] CVS: gaim/plugins notify.c,1.42,1.43

[Ethan B. <ebl...@us...>]

Update of /cvsroot/gaim/gaim/plugins
In directory sc8-pr-cvs1:/tmp/cvs-serv3798/plugins

Modified Files:
	notify.c 
Log Message:
Patch from Ari Pollak to bring the notify plugin's signals into late
August of 2003.  Thanks, Ari.


Index: notify.c
===================================================================
RCS file: /cvsroot/gaim/gaim/plugins/notify.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- notify.c	18 Aug 2003 01:03:42 -0000	1.42
+++ notify.c	25 Aug 2003 00:39:39 -0000	1.43
@@ -200,31 +200,40 @@
 }
 
 static gboolean
-chat_recv_im(GaimAccount *account, GaimConversation *conv, char **who,
-			 char **text)
+chat_recv_im(GaimAccount *account, char **who, char **text, int id, void *m)
 {
+	GaimConversation *conv = gaim_find_chat(
+								gaim_account_get_connection(account),
+								id);
 	if (conv)
 		notify(conv);
 
 	return FALSE;
 }
 
-static void chat_sent_im(GaimConversation *c, char **text) {
-	if (c)
-		unnotify(c);
+static void chat_sent_im(GaimAccount *account, char *text, int id, void *m) {
+	GaimConversation *conv = gaim_find_chat(
+								gaim_account_get_connection(account),
+								id);
+	
+	if (conv)
+		unnotify(conv);
 }
 
 static gboolean
-im_recv_im(GaimAccount *account, GaimConversation *conv, char **who,
-		   char **what, int *flags, void *m)
+im_recv_im(GaimAccount *account, char **who, char **what, int *flags, void *m)
 {
+	GaimConversation *conv = gaim_find_conversation_with_account(*who, account);
+	
 	if (conv)
 		notify(conv);
 
 	return FALSE;
 }
 
-static void im_sent_im(GaimConversation *conv, char **what, void *m) {
+static void im_sent_im(GaimAccount *account, char *who, void *m) {
+	GaimConversation *conv = gaim_find_conversation_with_account(who, account);
+
 	if (conv)
 		unnotify(conv);
 }