# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1230924676 0
# Node ID 300cf4e167202bb36221d50798c0fb330d90eaa7
# Parent  ae544623840b045a6c4fb41d39be9ea3ef2aecac
Fix merge

diff -r ae544623840b -r 300cf4e16720 libpurple/protocols/myspace/user.h
--- 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);