diff pidgin/gtklog.h @ 21570:dccfd999ffe7

merge of '76c07fcb434a2a7aa289734bb221c171a376d73b' and 'bad7c4c4e108d186fa8527e487d174e67ae7c0c1'

--- a/pidgin/gtklog.h	Sun Nov 11 16:45:19 2007 +0000
+++ b/pidgin/gtklog.h	Sat Nov 17 17:27:48 2007 +0000
@@ -52,41 +52,11 @@
 };
 
 
-#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
- */
-void pidgin_syslog_show_with_parent(GtkWindow *parent);
 
 /**************************************************************************/
 /** @name GTK+ Log Subsystem                                              */