Mercurial > pidgin.yaz
changeset 25012:300cf4e16720
Fix merge
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Fri, 02 Jan 2009 19:31:16 +0000 |
| parents | ae544623840b |
| children | 7bfaa0b61a83 |
| files | libpurple/protocols/myspace/user.h |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/user.h Fri Jan 02 19:27:02 2009 +0000 +++ b/libpurple/protocols/myspace/user.h Fri Jan 02 19:31:16 2009 +0000 @@ -46,7 +46,7 @@ * initiated from a user lookup. */ typedef void (*MSIM_USER_LOOKUP_CB)(MsimSession *session, const MsimMessage *userinfo, gpointer data); -MsimUser *msim_get_user_from_buddy(PurpleBuddy *buddy); +MsimUser *msim_get_user_from_buddy(PurpleBuddy *buddy, gboolean create); void msim_user_free(MsimUser *user); MsimUser *msim_find_user(MsimSession *session, const gchar *username); void msim_append_user_info(MsimSession *session, PurpleNotifyUserInfo *user_info, MsimUser *user, gboolean full);