Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/libxmpp.c @ 23364:30b5f145a0f7
merge of 'ba3f5db0711c5a3b7c5b5510df2e5e3ae5adbbc3'
and 'dab5669243bb3c1e57f6a22b430a4804cb65e582'
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Sat, 14 Jun 2008 00:59:35 +0000 |
parents | da78db9f188f bc3ecda40397 |
children | 10382f1e1353 3da0957e7821 |
comparison
equal
deleted
inserted
replaced
23360:da78db9f188f | 23364:30b5f145a0f7 |
---|---|
74 jabber_roster_add_buddy, /* add_buddy */ | 74 jabber_roster_add_buddy, /* add_buddy */ |
75 NULL, /* add_buddies */ | 75 NULL, /* add_buddies */ |
76 jabber_roster_remove_buddy, /* remove_buddy */ | 76 jabber_roster_remove_buddy, /* remove_buddy */ |
77 NULL, /* remove_buddies */ | 77 NULL, /* remove_buddies */ |
78 NULL, /* add_permit */ | 78 NULL, /* add_permit */ |
79 jabber_google_roster_add_deny, /* add_deny */ | 79 jabber_google_roster_add_deny, /* add_deny */ |
80 NULL, /* rem_permit */ | 80 NULL, /* rem_permit */ |
81 jabber_google_roster_rem_deny, /* rem_deny */ | 81 jabber_google_roster_rem_deny, /* rem_deny */ |
82 NULL, /* set_permit_deny */ | 82 NULL, /* set_permit_deny */ |
83 jabber_chat_join, /* join_chat */ | 83 jabber_chat_join, /* join_chat */ |
84 NULL, /* reject_chat */ | 84 NULL, /* reject_chat */ |
85 jabber_get_chat_name, /* get_chat_name */ | 85 jabber_get_chat_name, /* get_chat_name */ |
86 jabber_chat_invite, /* chat_invite */ | 86 jabber_chat_invite, /* chat_invite */ |
103 jabber_chat_set_topic, /* set_chat_topic */ | 103 jabber_chat_set_topic, /* set_chat_topic */ |
104 jabber_find_blist_chat, /* find_blist_chat */ | 104 jabber_find_blist_chat, /* find_blist_chat */ |
105 jabber_roomlist_get_list, /* roomlist_get_list */ | 105 jabber_roomlist_get_list, /* roomlist_get_list */ |
106 jabber_roomlist_cancel, /* roomlist_cancel */ | 106 jabber_roomlist_cancel, /* roomlist_cancel */ |
107 NULL, /* roomlist_expand_category */ | 107 NULL, /* roomlist_expand_category */ |
108 jabber_si_xfer_can_receive_file,/* can_receive_file */ | 108 NULL, /* can_receive_file */ |
109 jabber_si_xfer_send, /* send_file */ | 109 jabber_si_xfer_send, /* send_file */ |
110 jabber_si_new_xfer, /* new_xfer */ | 110 jabber_si_new_xfer, /* new_xfer */ |
111 jabber_offline_message, /* offline_message */ | 111 jabber_offline_message, /* offline_message */ |
112 NULL, /* whiteboard_prpl_ops */ | 112 NULL, /* whiteboard_prpl_ops */ |
113 jabber_prpl_send_raw, /* send_raw */ | 113 jabber_prpl_send_raw, /* send_raw */ |