[Gaim-commits] CVS: gaim/src away.c,1.61,1.62 core.h,1.7,1.8 prpl.h,1.50,1.51

[Eric W. <war...@us...>]

Update of /cvsroot/gaim/gaim/src
In directory usw-pr-cvs1:/tmp/cvs-serv21978/src

Modified Files:
	away.c core.h prpl.h 
Log Message:
i should have hidden something ultra-secret in this.


Index: away.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/away.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- away.c	2001/09/27 19:17:10	1.61
+++ away.c	2001/10/14 11:36:36	1.62
@@ -383,7 +383,7 @@
 				con = g_slist_next(con);
 			}
 
-			tmp = msgs = (*gc->prpl->away_states)();
+			tmp = msgs = (*gc->prpl->away_states)(gc);
 
 			if ((g_list_length(msgs) == 1) && !strcmp(msgs->data, GAIM_AWAY_CUSTOM)) {
 				awy = away_messages;
@@ -459,7 +459,7 @@
 				gtk_menu_item_set_submenu(GTK_MENU_ITEM(menuitem), submenu);
 				gtk_widget_show(submenu);
 
-				tmp = msgs = (*gc->prpl->away_states)();
+				tmp = msgs = (*gc->prpl->away_states)(gc);
 
 				if ((g_list_length(msgs) == 1) &&
 				    (!strcmp(msgs->data, GAIM_AWAY_CUSTOM))) {

Index: core.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/core.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- core.h	2001/10/08 01:12:02	1.7
+++ core.h	2001/10/14 11:36:36	1.8
@@ -35,11 +35,8 @@
 
 #include "multi.h"
 
-#define UC_AOL		1
-#define UC_ADMIN 	2
-#define UC_UNCONFIRMED	4
-#define UC_NORMAL	8
-#define UC_UNAVAILABLE  16
+/* Really user states are controlled by the PRPLs now. We just use this for event_away */
+#define UC_UNAVAILABLE  1
 
 struct aim_user {
 	char username[64];

Index: prpl.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/prpl.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- prpl.h	2001/10/03 09:48:33	1.50
+++ prpl.h	2001/10/14 11:36:36	1.51
@@ -85,7 +85,7 @@
 
 	/* returns the XPM associated with the given user class */
 	char **(* list_icon)(int);
-	GList *(* away_states)();
+	GList *(* away_states)(struct gaim_connection *gc);
 	GList *(* actions)();
 	void   (* do_action)(struct gaim_connection *, char *);
 	/* user_opts returns a GList* of g_malloc'd struct proto_user_opts */