Mercurial > pidgin.yaz
changeset 26021:25aadd8c3ec7
Fix merge.
| author | Mike Ruprecht <maiku@soc.pidgin.im> |
|---|---|
| date | Sun, 19 Oct 2008 04:55:34 +0000 |
| parents | 8bfa1f01f035 |
| children | 46387cbfaf85 |
| files | libpurple/protocols/jabber/buddy.h |
| diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/buddy.h Sun Oct 19 04:40:59 2008 +0000 +++ b/libpurple/protocols/jabber/buddy.h Sun Oct 19 04:55:34 2008 +0000 @@ -97,8 +97,6 @@ const char *jabber_buddy_get_status_msg(JabberBuddy *jb); void jabber_buddy_get_info(PurpleConnection *gc, const char *who); -gboolean jabber_buddy_has_capability(JabberBuddy *jb, const gchar *cap); - GList *jabber_blist_node_menu(PurpleBlistNode *node); void jabber_set_info(PurpleConnection *gc, const char *info);