[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.146,1.147

[Christian H. <ch...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory sc8-pr-cvs1:/tmp/cvs-serv15154/src/protocols/jabber

Modified Files:
	jabber.c 
Log Message:
Bye bye do_ask_dialog()! Mwahahahahhaha!

And wit -> with. What wit with the witty with wit comment, wit you jutht
thaw.


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- jabber.c	18 May 2003 19:59:00 -0000	1.146
+++ jabber.c	23 May 2003 02:42:51 -0000	1.147
@@ -1661,7 +1661,8 @@
 }
 
 /*
- * Callback from "accept" in do_ask_dialog() invoked by jabber_handles10n()
+ * Callback from "accept" in gaim_request_action() invoked
+ * by jabber_handles10n()
  */
 static void jabber_accept_add(struct jabber_add_permit *jap)
 {
@@ -1681,7 +1682,8 @@
 }
 
 /*
- * Callback from "deny/cancel" in do_ask_dialog() invoked by jabber_handles10n()
+ * Callback from "deny/cancel" in gaim_request_action() invoked
+ * by jabber_handles10n()
  */
 static void jabber_deny_add(struct jabber_add_permit *jap)
 {
@@ -1715,7 +1717,10 @@
 
 		jap->gc = GJ_GC(gjc);
 		jap->user = g_strdup(Jid);
-		do_ask_dialog(msg, NULL, jap, _("Authorize"), jabber_accept_add, _("Deny"), jabber_deny_add, my_protocol->handle, FALSE);
+
+		gaim_request_action(jap->gc, NULL, msg, NULL, 0, jap, 2,
+							_("Authorize"), G_CALLBACK(jabber_accept_add),
+							_("Deny"), G_CALLBACK(jabber_deny_add));
 
 		g_free(msg);
 		xmlnode_free(g);	/* Never needed it here anyway */