diff pidgin/gtkpounce.h @ 21344:80af064d311c

merge of '2511e448b3af6dfc5daebf1f6d4b485ef647c245' and '471ae1ec0ae96bb44471811c3a0d6b905743a400'

--- a/pidgin/gtkpounce.h	Fri Nov 16 22:59:33 2007 +0000
+++ b/pidgin/gtkpounce.h	Fri Nov 16 22:59:44 2007 +0000
@@ -34,40 +34,16 @@
  * @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(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
- */
-void pidgin_pounce_editor_show_with_parent(GtkWindow *parent, PurpleAccount *account, const char *name,
-								PurplePounce *cur_pounce);
-
-/**
  * Shows the pounces manager window.
- *
- * @deprecated Use pidgin_pounces_manager_show_with_parent() instead.
  */
 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);