changeset
Fix merge
Fri, 02 Jan 2009 19:31:16 +0000
- author
- Paul Aurich <darkrain42@pidgin.im>
- date
- Fri, 02 Jan 2009 19:31:16 +0000
- branch
- cpw.darkrain42.buddy-add
- changeset 25509
- 5fe5bd2e073f
- parent 25508
- f9dce428b2c0
- child 25510
- 107a2d8bbf26
Fix merge
| libpurple/protocols/myspace/user.h | file | annotate | diff | comparison | revisions |
--- 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);
