# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1195253960 0
# Node ID a051b177661e7532e77891ce6cd6ced3013828c8
# Parent  cc8bdfb16ddfb4a3ea841dd2b0b4a796e84e9b3b
disapproval of revision 'ce13b5ca4994abbd4934b3bc568c8b115335c426'

diff -r cc8bdfb16ddf -r a051b177661e ChangeLog
--- a/ChangeLog	Sat Oct 13 23:59:52 2007 +0000
+++ b/ChangeLog	Fri Nov 16 22:59:20 2007 +0000
@@ -12,8 +12,6 @@
 	  remove the plugin from the list of saved plugins so it won't load
 	  at the next startup.  Previously, we were ignoring this case, which
 	  could lead to crashes.
-	* Mark dialog windows as transient for appropriate parent windows to
-	  help window managers do the right thing  (Gabriel Schulhof)
 
 	Finch:
 	* If a plugin says it can't be unloaded, we now display an error and
diff -r cc8bdfb16ddf -r a051b177661e ChangeLog.API
--- a/ChangeLog.API	Sat Oct 13 23:59:52 2007 +0000
+++ b/ChangeLog.API	Fri Nov 16 22:59:20 2007 +0000
@@ -14,13 +14,6 @@
 		  to unload a plugin--fails.  This then prevents the plugin
 		  from being saved in the saved plugins list, so it'll won't
 		  be loaded at the next startup.
-		* pidgin_dialogs_about_with_parent()
-		* pidgin_log_show_contact_with_parent()
-		* pidgin_log_show_with_parent()
-		* pidgin_plugin_dialog_show_with_parent()
-		* pidgin_pounce_editor_show_with_parent()
-		* pidgin_pounces_manager_show_with_parent()
-		* pidgin_syslog_show_with_parent()
 
 		Changed:
 		* purple_plugin_unload() now honors the return value of a
@@ -29,15 +22,6 @@
 		  when a dependent plugin fails to unload.  The UI should do
 		  something appropriate.
 
-		Deprecated:
-		* pidgin_dialogs_about()
-		* pidgin_log_show_contact()
-		* pidgin_log_show()
-		* pidgin_plugin_dialog_show()
-		* pidgin_pounce_editor_show()
-		* pidgin_pounces_manager_show()
-		* pidgin_syslog_show()
-
 version 2.2.2 (??/??/????):
 	libpurple:
 		Changed:
diff -r cc8bdfb16ddf -r a051b177661e pidgin/gtkdialogs.h
--- a/pidgin/gtkdialogs.h	Sat Oct 13 23:59:52 2007 +0000
+++ b/pidgin/gtkdialogs.h	Fri Nov 16 22:59:20 2007 +0000
@@ -31,19 +31,9 @@
 #include "conversation.h"
 
 /* Functions in gtkdialogs.c (these should actually stay in this file) */
-
 void pidgin_dialogs_destroy_all(void);
-
-/**
- * @deprecated Use pidgin_dialogs_about_with_parent() instead.
- */
 void pidgin_dialogs_about(void);
-
-/**
- * @since 2.3.0
- */
 void pidgin_dialogs_about_with_parent(GtkWindow *parent);
-
 void pidgin_dialogs_im(void);
 void pidgin_dialogs_im_with_user(PurpleAccount *, const char *);
 void pidgin_dialogs_info(void);
diff -r cc8bdfb16ddf -r a051b177661e pidgin/gtklog.h
--- a/pidgin/gtklog.h	Sat Oct 13 23:59:52 2007 +0000
+++ b/pidgin/gtklog.h	Fri Nov 16 22:59:20 2007 +0000
@@ -52,34 +52,13 @@
 };
 
 
-/**
- * @deprecated Use pidgin_log_show_with_parent() instead.
- */
+
 void pidgin_log_show(PurpleLogType type, const char *screenname, PurpleAccount *account);
-
-/**
- * @since 2.3.0
- */
 void pidgin_log_show_with_parent(GtkWindow *parent, PurpleLogType type, const char *screenname, PurpleAccount *account);
-
-/**
- * @deprecated pidgin_log_show_contact_with_parent() instead.
- */
 void pidgin_log_show_contact(PurpleContact *contact);
-
-/**
- * @since 2.3.0
- */
 void pidgin_log_show_contact_with_parent(GtkWindow *parent, PurpleContact *contact);
 
-/**
- * @deprecated Use pidgin_syslog_show_with_parent() instead.
- */
 void pidgin_syslog_show(void);
-
-/**
- * @since 2.3.0
- */
 void pidgin_syslog_show_with_parent(GtkWindow *parent);
 
 /**************************************************************************/
diff -r cc8bdfb16ddf -r a051b177661e pidgin/gtkplugin.h
--- a/pidgin/gtkplugin.h	Sat Oct 13 23:59:52 2007 +0000
+++ b/pidgin/gtkplugin.h	Fri Nov 16 22:59:20 2007 +0000
@@ -74,15 +74,11 @@
 
 /**
  * Shows the Plugins dialog
- *
- * @deprecated Use pidgin_plugin_dialog_show_with_parent() instead.
  */
 void pidgin_plugin_dialog_show(void);
 
 /**
  * Shows the Plugins dialog, transient to a parent window
- *
- * @since 2.3.0
  */
 void pidgin_plugin_dialog_show_with_parent(GtkWindow *parent);
 
diff -r cc8bdfb16ddf -r a051b177661e pidgin/gtkpounce.h
--- a/pidgin/gtkpounce.h	Sat Oct 13 23:59:52 2007 +0000
+++ b/pidgin/gtkpounce.h	Fri Nov 16 22:59:20 2007 +0000
@@ -31,43 +31,31 @@
 /**
  * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
  *
+ * @param parent     The parent window.
  * @param account    The optional account to use.
  * @param name       The optional name to pounce on.
  * @param cur_pounce The current buddy pounce, if editing an existing one.
- *
- * @deprecated Use pidgin_pounce_editor_show_with_parent() instead.
+ */
+void pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name,
+								PurplePounce *cur_pounce);
+
+/**
+ * @deprecated Please use pidgin_pounce_editor_show_with_parent
  */
 void pidgin_pounce_editor_show(PurpleAccount *account, const char *name,
 								PurplePounce *cur_pounce);
 
 /**
- * Displays a New Buddy Pounce or Edit Buddy Pounce dialog.
- *
- * @param parent     The parent window.
- * @param account    The optional account to use.
- * @param name       The optional name to pounce on.
- * @param cur_pounce The current buddy pounce, if editing an existing one.
- *
- * @since 2.3.0
+ * Shows the pounces manager window.
  */
-void pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name,
-								PurplePounce *cur_pounce);
+void pidgin_pounces_manager_show_with_parent(GtkWindow *parent);
 
 /**
- * Shows the pounces manager window.
- *
- * @deprecated Use pidgin_pounces_manager_show_with_parent() instead.
+ * @deprecated Please use pidgin_pounces_manager_show_with_parent
  */
 void pidgin_pounces_manager_show(void);
 
 /**
- * Shows the pounces manager window.
- *
- * @since 2.3.0
- */
-void pidgin_pounces_manager_show_with_parent(GtkWindow *parent);
-
-/**
  * Hides the pounces manager window.
  */
 void pidgin_pounces_manager_hide(void);