diff libpurple/gaim-compat.h @ 20096:2a9f3a499b0d

merge of '34d642b12b7215d55fd032cd513a7e225715f19a' and '7868c3b2b7d17c52916e4bb76305b7e3b68d3904'

--- a/libpurple/gaim-compat.h	Mon Sep 17 03:34:11 2007 +0000
+++ b/libpurple/gaim-compat.h	Mon Sep 17 03:47:45 2007 +0000
@@ -1,8 +1,9 @@
 /**
  * @file gaim-compat.h Gaim Compat macros
  * @ingroup core
- *
- * pidgin
+ */
+
+/* pidgin
  *
  * Pidgin is the legal property of its developers, whose names are too numerous
  * to list here.  Please refer to the COPYRIGHT file distributed with this
@@ -20,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  *
  * @see @ref account-signals
  */
@@ -1654,7 +1655,7 @@
 #define gaim_request_choice_varg        purple_request_choice_varg
 #define gaim_request_action             purple_request_action
 #define gaim_request_action_varg        purple_request_action_varg
-#define gaim_request_fields             purple_request_fields
+#define gaim_request_fields(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb, user_data)             purple_request_fields(handle, title, primary, secondary, fields, ok_text, ok_cb, cancel_text, cancel_cb, NULL, NULL, NULL, user_data)
 #define gaim_request_close              purple_request_close
 #define gaim_request_close_with_handle  purple_request_close_with_handle