# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1192331683 0
# Node ID aabe638f56d93d516feab522e07bf588ef7952fd
# Parent  110f23ef354245ebc27c4b05420e6f6e20f0dc49
Wrap the newly deprecated functions with #ifndef PURPLE_DISABLE_DEPRECATED.

diff -r 110f23ef3542 -r aabe638f56d9 libpurple/request.h
--- a/libpurple/request.h	Sun Oct 14 03:07:06 2007 +0000
+++ b/libpurple/request.h	Sun Oct 14 03:14:43 2007 +0000
@@ -1315,6 +1315,7 @@
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
 						 const char *ui_hint, void *user_data);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Prompts the user for text input.
  *
@@ -1362,6 +1363,7 @@
 						 const char *cancel_text, GCallback cancel_cb,
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
 						 void *user_data);
+#endif
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1397,6 +1399,7 @@
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  const char *ui_hint, void *user_data, ...) G_GNUC_NULL_TERMINATED;
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Prompts the user for multiple-choice input.
  *
@@ -1430,6 +1433,7 @@
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, ...) G_GNUC_NULL_TERMINATED;
+#endif
 
 /**
  * Prompts the user for multiple-choice input.
@@ -1465,6 +1469,7 @@
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   const char *ui_hint, void *user_data, va_list choices);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Prompts the user for multiple-choice input.
  *
@@ -1498,6 +1503,7 @@
 							   const char *cancel_text, GCallback cancel_cb,
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   void *user_data, va_list choices);
+#endif
 
 /**
  * Prompts the user for an action.
@@ -1535,6 +1541,7 @@
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  const char *ui_hint, void *user_data, size_t action_count, ...);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Prompts the user for an action.
  *
@@ -1570,6 +1577,7 @@
 						  int default_action,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, size_t action_count, ...);
+#endif
 
 /**
  * Prompts the user for an action.
@@ -1602,6 +1610,7 @@
 							   const char *ui_hint, void *user_data, size_t action_count,
 							   va_list actions);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Prompts the user for an action.
  *
@@ -1632,6 +1641,7 @@
 							   PurpleAccount *account, const char *who, PurpleConversation *conv,
 							   void *user_data, size_t action_count,
 							   va_list actions);
+#endif
 
 /**
  * Displays groups of fields for the user to fill in.
@@ -1665,6 +1675,7 @@
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  const char *ui_hint, void *user_data);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Displays groups of fields for the user to fill in.
  *
@@ -1696,6 +1707,7 @@
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data);
+#endif
 
 /**
  * Closes a request.
@@ -1724,6 +1736,7 @@
 						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_Yes"), (yes_cb), _("_No"), (no_cb))
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
  *
@@ -1735,6 +1748,7 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_Yes"), (yes_cb), _("_No"), (no_cb))
+#endif
 
 /**
  * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
@@ -1748,6 +1762,7 @@
 						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
  *
@@ -1759,6 +1774,7 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_OK"), (ok_cb), _("_Cancel"), (cancel_cb))
+#endif
 
 /**
  * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
@@ -1772,6 +1788,7 @@
 						(default_action), account, who, conv, (ui_hint), (user_data), 2, \
 						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
  *
@@ -1783,6 +1800,7 @@
 	purple_request_action((handle), (title), (primary), (secondary), \
 						(default_action), account, who, conv, (user_data), 2, \
 						_("_Accept"), (accept_cb), _("_Cancel"), (cancel_cb))
+#endif
 
 /**
  * Displays a file selector request dialog.  Returns the selected filename to
@@ -1813,6 +1831,7 @@
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						const char *ui_hint, void *user_data);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Displays a file selector request dialog.  Returns the selected filename to
  * the callback.  Can be used for either opening a file or saving a file.
@@ -1841,6 +1860,7 @@
 						GCallback ok_cb, GCallback cancel_cb,
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data);
+#endif
 
 /**
  * Displays a folder select dialog. Returns the selected filename to
@@ -1868,6 +1888,7 @@
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						const char *ui_hint, void *user_data);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Displays a folder select dialog. Returns the selected filename to
  * the callback.
@@ -1893,6 +1914,7 @@
 						GCallback ok_cb, GCallback cancel_cb,
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data);
+#endif
 
 /*@}*/
 
diff -r 110f23ef3542 -r aabe638f56d9 pidgin/gtkdialogs.h
--- a/pidgin/gtkdialogs.h	Sun Oct 14 03:07:06 2007 +0000
+++ b/pidgin/gtkdialogs.h	Sun Oct 14 03:14:43 2007 +0000
@@ -34,10 +34,12 @@
 
 void pidgin_dialogs_destroy_all(void);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * @deprecated Use pidgin_dialogs_about_with_parent() instead.
  */
 void pidgin_dialogs_about(void);
+#endif
 
 /**
  * @since 2.3.0
@@ -49,11 +51,13 @@
 void pidgin_dialogs_info(void);
 void pidgin_dialogs_log(void);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * @deprecated This function is no longer used and will be removed in
  *             Pidgin 3.0.0 unless there is sufficient demand to keep it.
  */
 void pidgin_dialogs_alias_contact(PurpleContact *);
+#endif
 
 void pidgin_dialogs_alias_buddy(PurpleBuddy *);
 void pidgin_dialogs_alias_chat(PurpleChat *);
diff -r 110f23ef3542 -r aabe638f56d9 pidgin/gtklog.h
--- a/pidgin/gtklog.h	Sun Oct 14 03:07:06 2007 +0000
+++ b/pidgin/gtklog.h	Sun Oct 14 03:14:43 2007 +0000
@@ -52,30 +52,36 @@
 };
 
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * @deprecated Use pidgin_log_show_with_parent() instead.
  */
 void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account);
+#endif
 
 /**
  * @since 2.3.0
  */
 void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * @deprecated pidgin_log_show_contact_with_parent() instead.
  */
 void pidgin_log_show_contact(PurpleContact *contact);
+#endif
 
 /**
  * @since 2.3.0
  */
 void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * @deprecated Use pidgin_syslog_show_with_parent() instead.
  */
 void pidgin_syslog_show(void);
+#endif
 
 /**
  * @since 2.3.0
diff -r 110f23ef3542 -r aabe638f56d9 pidgin/gtkplugin.h
--- a/pidgin/gtkplugin.h	Sun Oct 14 03:07:06 2007 +0000
+++ b/pidgin/gtkplugin.h	Sun Oct 14 03:14:43 2007 +0000
@@ -72,12 +72,14 @@
  */
 void pidgin_plugins_save(void);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Shows the Plugins dialog
  *
  * @deprecated Use pidgin_plugin_dialog_show_with_parent() instead.
  */
 void pidgin_plugin_dialog_show(void);
+#endif
 
 /**
  * Shows the Plugins dialog, transient to a parent window
diff -r 110f23ef3542 -r aabe638f56d9 pidgin/gtkpounce.h
--- a/pidgin/gtkpounce.h	Sun Oct 14 03:07:06 2007 +0000
+++ b/pidgin/gtkpounce.h	Sun Oct 14 03:14:43 2007 +0000
@@ -28,6 +28,7 @@
 
 #include "pounce.h"
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
  *
@@ -39,6 +40,7 @@
  */
 void pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
 								PurplePounce *cur_pounce);
+#endif
 
 /**
  * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
@@ -53,12 +55,14 @@
 void pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name,
 								PurplePounce *cur_pounce);
 
+#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Shows the pounces manager window.
  *
  * @deprecated Use pidgin_pounces_manager_show_with_parent() instead.
  */
 void pidgin_pounces_manager_show(void);
+#endif
 
 /**
  * Shows the pounces manager window.