# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195254003 0
# Node ID 998cf5d0b401cf4f9a9a25601ca3d84fc1b65596
# Parent  aabe638f56d93d516feab522e07bf588ef7952fd
disapproval of revision '0e51fd6f70ba330cbc25cff479b5c6325e939196'

diff -r aabe638f56d9 -r 998cf5d0b401 libpurple/request.h
--- a/libpurple/request.h	Sun Oct 14 03:14:43 2007 +0000
+++ b/libpurple/request.h	Fri Nov 16 23:00:03 2007 +0000
@@ -1315,7 +1315,6 @@
 						 PurpleAccount *account, const char *who, PurpleConversation *conv,
 						 const char *ui_hint, void *user_data);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Prompts the user for text input.
  *
@@ -1363,7 +1362,6 @@
 						 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.
@@ -1399,7 +1397,6 @@
 						  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.
  *
@@ -1433,7 +1430,6 @@
 						  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.
@@ -1469,7 +1465,6 @@
 							   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.
  *
@@ -1503,7 +1498,6 @@
 							   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.
@@ -1541,7 +1535,6 @@
 						  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.
  *
@@ -1577,7 +1570,6 @@
 						  int default_action,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data, size_t action_count, ...);
-#endif
 
 /**
  * Prompts the user for an action.
@@ -1610,7 +1602,6 @@
 							   const char *ui_hint, void *user_data, size_t action_count,
 							   va_list actions);
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Prompts the user for an action.
  *
@@ -1641,7 +1632,6 @@
 							   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.
@@ -1675,7 +1665,6 @@
 						  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.
  *
@@ -1707,7 +1696,6 @@
 						  const char *cancel_text, GCallback cancel_cb,
 						  PurpleAccount *account, const char *who, PurpleConversation *conv,
 						  void *user_data);
-#endif
 
 /**
  * Closes a request.
@@ -1736,7 +1724,6 @@
 						(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.
  *
@@ -1748,7 +1735,6 @@
 	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.
@@ -1762,7 +1748,6 @@
 						(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.
  *
@@ -1774,7 +1759,6 @@
 	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.
@@ -1788,7 +1772,6 @@
 						(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.
  *
@@ -1800,7 +1783,6 @@
 	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
@@ -1831,7 +1813,6 @@
 						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.
@@ -1860,7 +1841,6 @@
 						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
@@ -1888,7 +1868,6 @@
 						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.
@@ -1914,7 +1893,6 @@
 						GCallback ok_cb, GCallback cancel_cb,
 						PurpleAccount *account, const char *who, PurpleConversation *conv,
 						void *user_data);
-#endif
 
 /*@}*/
 
diff -r aabe638f56d9 -r 998cf5d0b401 pidgin/gtkdialogs.h
--- a/pidgin/gtkdialogs.h	Sun Oct 14 03:14:43 2007 +0000
+++ b/pidgin/gtkdialogs.h	Fri Nov 16 23:00:03 2007 +0000
@@ -34,12 +34,10 @@
 
 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
@@ -51,13 +49,11 @@
 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 aabe638f56d9 -r 998cf5d0b401 pidgin/gtklog.h
--- a/pidgin/gtklog.h	Sun Oct 14 03:14:43 2007 +0000
+++ b/pidgin/gtklog.h	Fri Nov 16 23:00:03 2007 +0000
@@ -52,36 +52,30 @@
 };
 
 
-#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 aabe638f56d9 -r 998cf5d0b401 pidgin/gtkplugin.h
--- a/pidgin/gtkplugin.h	Sun Oct 14 03:14:43 2007 +0000
+++ b/pidgin/gtkplugin.h	Fri Nov 16 23:00:03 2007 +0000
@@ -72,14 +72,12 @@
  */
 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 aabe638f56d9 -r 998cf5d0b401 pidgin/gtkpounce.h
--- a/pidgin/gtkpounce.h	Sun Oct 14 03:14:43 2007 +0000
+++ b/pidgin/gtkpounce.h	Fri Nov 16 23:00:03 2007 +0000
@@ -28,7 +28,6 @@
 
 #include "pounce.h"
 
-#ifndef PURPLE_DISABLE_DEPRECATED
 /**
  * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
  *
@@ -40,7 +39,6 @@
  */
 void pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
 								PurplePounce *cur_pounce);
-#endif
 
 /**
  * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
@@ -55,14 +53,12 @@
 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.