Mercurial > pidgin3 / file diff

--- a/libpurple/account.c	Sun Sep 08 12:06:44 2013 +0530
+++ b/libpurple/account.c	Thu Sep 12 19:55:22 2013 +0530
@@ -277,15 +277,9 @@
 	field = purple_request_field_bool_new("remember", _("Save password"), FALSE);
 	purple_request_field_group_add_field(group, field);
 
-	purple_request_fields(account,
-                        NULL,
-                        primary,
-                        NULL,
-                        fields,
-                        _("OK"), ok_cb,
-                        _("Cancel"), cancel_cb,
-						account, NULL, NULL,
-                        user_data);
+	purple_request_fields(account, NULL, primary, NULL, fields, _("OK"),
+		ok_cb, _("Cancel"), cancel_cb,
+		purple_request_cpar_from_account(account), user_data);
 	g_free(primary);
 }
 
@@ -657,16 +651,11 @@
 
 	/* I'm sticking this somewhere in the code: bologna */
 
-	purple_request_fields(purple_account_get_connection(account),
-						NULL,
-						primary,
-						_("Please enter your current password and your "
-						  "new password."),
-						fields,
-						_("OK"), G_CALLBACK(change_password_cb),
-						_("Cancel"), NULL,
-						account, NULL, NULL,
-						account);
+	purple_request_fields(purple_account_get_connection(account), NULL,
+		primary, _("Please enter your current password and your new "
+		"password."), fields, _("OK"), G_CALLBACK(change_password_cb),
+		_("Cancel"), NULL, purple_request_cpar_from_account(account),
+		account);
 }
 
 static void
@@ -700,7 +689,7 @@
 					   (purple_connection_get_flags(gc) & PURPLE_CONNECTION_FLAG_HTML) ? "html" : NULL),
 					   _("Save"), G_CALLBACK(set_user_info_cb),
 					   _("Cancel"), NULL,
-					   account, NULL, NULL,
+					   purple_request_cpar_from_account(account),
 					   account);
 }