Mercurial > pidgin.yaz
changeset 29374:7f97370e674b
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
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Fri, 05 Feb 2010 22:54:00 +0000 |
| parents | 462cb893521b |
| children | 8e007ad2421d |
| files | libpurple/protocols/msn/user.c libpurple/protocols/msn/user.h libpurple/protocols/msn/userlist.c libpurple/protocols/msn/userlist.h |
| diffstat | 4 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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); /*@}*/
--- 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;
--- 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);