cpw.darkrain42.buddy-add: c29b3b2f: Fix merge

[paul at darkrain42.org]

-----------------------------------------------------------------
Revision: c29b3b2fa5d4e173fd9e476cfbb5a34cfc537b99
Ancestor: 35a8de7906a7f7e4b17f1003b3d870e12be4c50c
Author: paul at darkrain42.org
Date: 2009-01-02T19:31:16
Branch: im.pidgin.cpw.darkrain42.buddy-add
URL: http://d.pidgin.im/viewmtn/revision/info/c29b3b2fa5d4e173fd9e476cfbb5a34cfc537b99

Modified files:
        libpurple/protocols/myspace/user.h

ChangeLog: 

Fix merge

-------------- next part --------------
============================================================
--- libpurple/protocols/myspace/user.h	d0f7d03ca835197dd945a6e5eec6fdcb2fb2137b
+++ libpurple/protocols/myspace/user.h	7c8a6aa909751831656cc942c610832c3ac0e9b0
@@ -46,7 +46,7 @@ typedef void (*MSIM_USER_LOOKUP_CB)(Msim
  * 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);