# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1313895697 0
# Node ID 9e9efd1a09a29e558b9c10a98644368ef8fdaae9
# Parent  58e0e310ef2e4336d7ab089b49a1966efd345bb3
Remove more deprecated stuff

diff -r 58e0e310ef2e -r 9e9efd1a09a2 pidgin/gtkdialogs.c
--- a/pidgin/gtkdialogs.c	Sun Aug 21 02:56:19 2011 +0000
+++ b/pidgin/gtkdialogs.c	Sun Aug 21 03:01:37 2011 +0000
@@ -1114,26 +1114,6 @@
 }
 
 static void
-pidgin_dialogs_alias_contact_cb(PurpleContact *contact, const char *new_alias)
-{
-	purple_blist_alias_contact(contact, new_alias);
-}
-
-void
-pidgin_dialogs_alias_contact(PurpleContact *contact)
-{
-	g_return_if_fail(contact != NULL);
-
-	purple_request_input(NULL, _("Alias Contact"), NULL,
-					   _("Enter an alias for this contact."),
-					   contact->alias, FALSE, FALSE, NULL,
-					   _("Alias"), G_CALLBACK(pidgin_dialogs_alias_contact_cb),
-					   _("Cancel"), NULL,
-					   NULL, purple_contact_get_alias(contact), NULL,
-					   contact);
-}
-
-static void
 pidgin_dialogs_alias_buddy_cb(PurpleBuddy *buddy, const char *new_alias)
 {
 	purple_blist_alias_buddy(buddy, new_alias);
diff -r 58e0e310ef2e -r 9e9efd1a09a2 pidgin/gtkdialogs.h
--- a/pidgin/gtkdialogs.h	Sun Aug 21 02:56:19 2011 +0000
+++ b/pidgin/gtkdialogs.h	Sun Aug 21 03:01:37 2011 +0000
@@ -42,14 +42,6 @@
 void pidgin_dialogs_info(void);
 void pidgin_dialogs_log(void);
 
-#if !(defined PIDGIN_DISABLE_DEPRECATED) || (defined _PIDGIN_GTKDIALOGS_C_)
-/**
- * @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 *);
 void pidgin_dialogs_remove_buddy(PurpleBuddy *);
diff -r 58e0e310ef2e -r 9e9efd1a09a2 pidgin/gtkimhtml.h
--- a/pidgin/gtkimhtml.h	Sun Aug 21 02:56:19 2011 +0000
+++ b/pidgin/gtkimhtml.h	Sun Aug 21 03:01:37 2011 +0000
@@ -154,20 +154,6 @@
 	GList *protocols; /* List of GtkIMHtmlProtocol's */
 };
 
-#if !(defined PIDGIN_DISABLE_DEPRECATED) && !(defined _PIDGIN_GTKIMHTML_C_)
-/** @deprecated as of 2.7.10 */
-struct _GtkIMHtmlFontDetail {
-	gushort size;
-	gchar *face;
-	gchar *fore;
-	gchar *back;
-	gchar *bg;
-	gchar *sml;
-	gboolean underline;
-	gshort bold;
-};
-#endif
-
 struct _GtkSmileyTree {
 	GString *values;
 	GtkSmileyTree **children;
diff -r 58e0e310ef2e -r 9e9efd1a09a2 pidgin/plugins/perl/common/GtkDialogs.xs
--- a/pidgin/plugins/perl/common/GtkDialogs.xs	Sun Aug 21 02:56:19 2011 +0000
+++ b/pidgin/plugins/perl/common/GtkDialogs.xs	Sun Aug 21 03:01:37 2011 +0000
@@ -24,10 +24,6 @@
 pidgin_dialogs_log()
 
 void
-pidgin_dialogs_alias_contact(contact)
-	Purple::BuddyList::Contact contact
-
-void
 pidgin_dialogs_alias_buddy(buddy)
 	Purple::BuddyList::Buddy buddy