pidgin: 527b068e: Use our MsnListOp enum in more places in...

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 527b068e9a1ccdec2baa09dfad37524062579f4c
Ancestor: be31995039c1f8edae9ebedb54fc5fa3fa42e232
Author: markdoliner at pidgin.im
Date: 2010-02-05T22:54:00
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/527b068e9a1ccdec2baa09dfad37524062579f4c

Modified files:
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h

ChangeLog: 

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

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/user.c	e21a2c55c1a3619b39293e9d40abbfe2913ca4ce
+++ libpurple/protocols/msn/user.c	ea4fa872ef3a5b1240283cbd1b1f859ddda56186
@@ -217,7 +217,7 @@ void
 }
 
 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
 }
 
 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);
 
============================================================
--- libpurple/protocols/msn/user.h	8275625d622e350db839897f6a011187ad153b3b
+++ libpurple/protocols/msn/user.h	e64a306b01966c54fe466f68950dc7f90b32cd8c
@@ -105,7 +105,7 @@ struct _MsnUser
 
 	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
  */
 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);
 
 /*@}*/
 
============================================================
--- libpurple/protocols/msn/userlist.c	9ed73ccc9a7083ac1668ad2d5dee1744786844cf
+++ libpurple/protocols/msn/userlist.c	cb78e95f59e8d02141a6b5a3f63af32630c3a548
@@ -137,7 +137,7 @@ msn_got_lst_user(MsnSession *session, Ms
 
 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;
============================================================
--- libpurple/protocols/msn/userlist.h	d43232b8a904491f8b93d74542278733e8c2e43d
+++ libpurple/protocols/msn/userlist.h	ded1c1fec51cc1e812ad891694efe7f8fcbf5a23
@@ -36,6 +36,7 @@ typedef enum
 } MsnListId;
 
 #include "group.h"
+#include "msn.h"
 #include "user.h"
 
 struct _MsnUserList
@@ -55,7 +56,7 @@ void msn_got_lst_user(MsnSession *sessio
 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);