# HG changeset patch # User Mark Doliner # Date 1265410440 0 # Node ID 7f97370e674bcd91c602bf37b95d3eb2980e3287 # Parent 462cb893521b5f80adef26a09e66e054fcc57a2c Use our MsnListOp enum in more places instead of int. I'm assuming the reason this wasn't done before is because of the circular header file dependencies. But that should be fine now that enums are declared before #includes diff -r 462cb893521b -r 7f97370e674b libpurple/protocols/msn/user.c --- a/libpurple/protocols/msn/user.c Fri Feb 05 22:49:11 2010 +0000 +++ b/libpurple/protocols/msn/user.c Fri Feb 05 22:54:00 2010 +0000 @@ -217,7 +217,7 @@ } void -msn_user_set_op(MsnUser *user, int list_op) +msn_user_set_op(MsnUser *user, MsnListOp list_op) { g_return_if_fail(user != NULL); @@ -225,7 +225,7 @@ } void -msn_user_unset_op(MsnUser *user, int list_op) +msn_user_unset_op(MsnUser *user, MsnListOp list_op) { g_return_if_fail(user != NULL); diff -r 462cb893521b -r 7f97370e674b libpurple/protocols/msn/user.h --- a/libpurple/protocols/msn/user.h Fri Feb 05 22:49:11 2010 +0000 +++ b/libpurple/protocols/msn/user.h Fri Feb 05 22:54:00 2010 +0000 @@ -105,7 +105,7 @@ MsnNetwork networkid; /**< The user's network */ - int list_op; /**< Which lists the user is in */ + MsnListOp list_op; /**< Which lists the user is in */ /** * The membershipId for this buddy on our pending list. Sent by @@ -400,8 +400,8 @@ */ gboolean msn_user_is_yahoo(PurpleAccount *account ,const char *name); -void msn_user_set_op(MsnUser *user, int list_op); -void msn_user_unset_op(MsnUser *user, int list_op); +void msn_user_set_op(MsnUser *user, MsnListOp list_op); +void msn_user_unset_op(MsnUser *user, MsnListOp list_op); /*@}*/ diff -r 462cb893521b -r 7f97370e674b libpurple/protocols/msn/userlist.c --- a/libpurple/protocols/msn/userlist.c Fri Feb 05 22:49:11 2010 +0000 +++ b/libpurple/protocols/msn/userlist.c Fri Feb 05 22:54:00 2010 +0000 @@ -137,7 +137,7 @@ void msn_got_lst_user(MsnSession *session, MsnUser *user, - int list_op, GSList *group_ids) + MsnListOp list_op, GSList *group_ids) { PurpleConnection *gc; PurpleAccount *account; diff -r 462cb893521b -r 7f97370e674b libpurple/protocols/msn/userlist.h --- a/libpurple/protocols/msn/userlist.h Fri Feb 05 22:49:11 2010 +0000 +++ b/libpurple/protocols/msn/userlist.h Fri Feb 05 22:54:00 2010 +0000 @@ -36,6 +36,7 @@ } MsnListId; #include "group.h" +#include "msn.h" #include "user.h" struct _MsnUserList @@ -55,7 +56,7 @@ gboolean msn_userlist_user_is_in_list(MsnUser *user, MsnListId list_id); void msn_got_lst_user(MsnSession *session, MsnUser *user, - int list_op, GSList *group_ids); + MsnListOp list_op, GSList *group_ids); MsnUserList *msn_userlist_new(MsnSession *session); void msn_userlist_destroy(MsnUserList *userlist);