Mercurial > pidgin3 / changeset

--- a/libpurple/protocols/jabber/presence.c	Sun Aug 12 17:55:38 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Sun Aug 12 18:17:21 2007 +0000
@@ -368,7 +368,7 @@
 											" accept the default settings?"),
 										/* Default Action */ 1,
 										purple_connection_get_account(js->gc), NULL, chat->conv,
-										chat, 2,
+										"chat", chat, 2,
 										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
 										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
 						}

--- a/libpurple/protocols/jabber/si.c	Sun Aug 12 17:55:38 2007 +0000
+++ b/libpurple/protocols/jabber/si.c	Sun Aug 12 18:17:21 2007 +0000
@@ -866,7 +866,7 @@
 
 			purple_request_fields(jsx->js->gc, _("Select a Resource"), msg, NULL, fields,
 					_("Send File"), G_CALLBACK(resource_select_ok_cb), _("Cancel"), G_CALLBACK(resource_select_cancel_cb),
-					jsx->js->gc->account, xfer->who, NULL, xfer);
+					jsx->js->gc->account, xfer->who, NULL, "xfer", xfer);
 
 			g_free(msg);
 		}