-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

i made some changes so it jon-gtk-gui compiles but doesn't seem to work the 
file-transfers.
the changes were done `by example' from a commit of 10 Aug.

maybe usefull for the gtk addicts.



-----BEGIN PGP SIGNATURE-----

iD8DBQE9eqUPUMlRieHkprgRAnnhAJ9PG6ghj42+gxTW4aWbWYGseIqYxgCfcGyk
Xw5TCYhvJhWrHFKo3z4WWBM=
=fKI7
-----END PGP SIGNATURE-----
? autom4te.cache
? config.h.in
? config.log
? config.status
? stamp-h1
Index: src/chat_window.cpp
===================================================================
RCS file: /cvsroot/licq/jons-gtk-gui/src/chat_window.cpp,v
retrieving revision 1.17
diff -u -d -p -r1.17 chat_window.cpp
--- src/chat_window.cpp	6 Aug 2002 14:03:58 -0000	1.17
+++ src/chat_window.cpp	8 Sep 2002 01:13:13 -0000
@@ -387,7 +387,9 @@ void chat_refuse(GtkWidget *widget, gpoi
 	struct remote_chat_request *r_cr = (struct remote_chat_request *)data;
 	/* Refuse the chat */
 	icq_daemon->icqChatRequestRefuse(r_cr->uin, "",
-					 r_cr->c_event->Sequence());
+					 r_cr->c_event->Sequence(),
+					 r_cr->c_event->MessageID(),
+					 r_cr->c_event->IsDirect());
 
 	/* Close the request window */
 	gtk_widget_destroy(r_cr->dialog);
@@ -402,7 +404,9 @@ void chat_join_multiparty(struct remote_
 		return;
 
 	icq_daemon->icqChatRequestAccept(r_cr->uin, cw->chatman->LocalPort(),
-					 r_cr->c_event->Sequence());
+					 r_cr->c_event->Sequence(),
+					 r_cr->c_event->MessageID(),
+					 r_cr->c_event->IsDirect());
 }
 
 void chat_start_as_server(gulong uin, CEventChat *c)
@@ -414,7 +418,8 @@ void chat_start_as_server(gulong uin, CE
 		return;
 
 	icq_daemon->icqChatRequestAccept(uin, cw->chatman->LocalPort(),
-					 c->Sequence());
+					 c->Sequence(),
+					 c->MessageID(), c->IsDirect());
 }
 
 void chat_start_as_client(ICQEvent *event)
Index: src/file_window.cpp
===================================================================
RCS file: /cvsroot/licq/jons-gtk-gui/src/file_window.cpp,v
retrieving revision 1.17
diff -u -d -p -r1.17 file_window.cpp
--- src/file_window.cpp	6 Aug 2002 14:03:58 -0000	1.17
+++ src/file_window.cpp	8 Sep 2002 01:13:13 -0000
@@ -127,19 +127,26 @@ void refusal_ok(GtkWidget *widget, gpoin
 	struct file_accept *fa = (struct file_accept *)_fa;
 	const char *reason = gtk_editable_get_chars(GTK_EDITABLE(fa->text),
 				0, -1);
+	CEventFile *f = (CEventFile *)fa->e;
+	
 
 	// The user gave a reason
 	if((strcmp(reason, "") != 0))
 	{
 		icq_daemon->icqFileTransferRefuse(fa->user->Uin(),
-			reason, fa->e->Sequence());
+			reason, fa->e->Sequence(), 
+			f->MessageID(),
+			f->IsDirect());
 	}
 	
 	// Use a default reason
 	else
 	{
 		icq_daemon->icqFileTransferRefuse(fa->user->Uin(),
-			"No reason given.", fa->e->Sequence());
+			"No reason given.", fa->e->Sequence(),
+			f->MessageID(),
+			f->IsDirect()
+			);
 	}
 
 	dialog_close(0, fa->window2);
@@ -159,6 +166,7 @@ void accept_file(GtkWidget *widget, gpoi
 void save_file(struct file_accept *fa)
 {
 	struct file_window *fw;
+	CEventFile *f = (CEventFile *)fa->e;
 	
 	fw = g_new0(struct file_window, 1);
 	fw->uin = fa->user->Uin();
@@ -180,8 +188,10 @@ void save_file(struct file_accept *fa)
 
 	// Actually accept the file
 	icq_daemon->icqFileTransferAccept(fw->uin,
-					  fw->ftman->LocalPort(), fw->sequence,
-					  false);
+					  fw->ftman->LocalPort(),
+					  fw->sequence,
+					  f->MessageID(),
+					  f->IsDirect());
 }
 
 void create_file_window(struct file_window *fw)

Reply via email to